Conflict Resolution (Version Control)

← Back to Branching and Merging

Manual resolution when Git cannot automatically merge changes. Conflicts occur when the same lines are modified in different branches. Tools include merge editors, vimdiff, VS Code merge editor, and Git’s rerere (reuse recorded resolution).

Key Properties

• Conflict Markers
• Merge Tools
• Rerere

Related

• Merge Commits (merge can cause conflicts)
• Rebase (rebase can cause conflicts per-commit)

---

git merging conflict-resolution