merge conflict

The situation where two branches changed the same lines differently since their merge base, so Git cannot combine them and asks you to choose.

In more detail

Git merges everything else automatically, then pauses and marks each clash in the file with conflict markers. You edit the file to the result you want, git add it to mark it resolved, and commit to finish, or abandon the merge with git merge --abort. A clean text merge is not proof the program works, so test afterwards.

Examples

A shared changelog edited by many pull requests conflicts constantly; Changesets gives each change its own file instead.
long      9 commits behind trunk   merge conflict  conflicted files 1
git add shopping.txt

Related terms

Taught in

References