Git Merge Conflicts
On this page
What causes conflicts?
Conflicts occur when the same lines are modified differently in two branches.
Conflict markers
<<<<<<< HEAD ======= >>>>>>> branch-name
Resolution steps
- Edit file manually
- Remove markers
- Stage file
- Commit merge
Abort merge
git merge --abort