@openstem shared this note
Software · L2 · Git & Dev Workflow: Resolving a Merge Conflict
What the conflict markers Git inserts actually mean, and the exact steps to resolve and complete a conflicted merge.
Software
Updated 2
2
Read only
More in Software
Browse Software- Software · L2 · MongoDB: Replica Sets & Failovernote
- Software · L5 · Compiler Construction Theorynote
- Software · L1 · Operating Systems: The Process Lifecyclenote
- Software · L5 · Type Theory and the λ-Calculusnote
- Software · L2 · PostgreSQL: Replication & High Availabilitynote
- Software · L4 · Applied Cryptography for Engineersnote