Git & GitHub
Merge Conflict
What happens when two branches change the same line of the same file in different ways.
Reviewed by the RadarTrek editorial team · June 2026
A merge conflict occurs when Git can't automatically combine two branches because both changed the same part of a file. Git pauses the merge and marks the conflicting section with special markers, leaving you to choose (or combine) which version to keep before completing the merge.
Why it matters
- —Conflicts are normal, not a sign you broke something — they happen on every active team.
- —Resolving one is just editing the file to keep the version you want, then committing.
- —Editors like VS Code and Cursor show clickable "accept" buttons, so most conflicts take seconds.
Where to learn this
🎓
Branching: Work Without Risk
Git & GitHub course
This is the exact lesson that covers this term in depth — with examples, diagrams, and a hands-on exercise.