conflict markers
The lines Git writes into a conflicted file: <<<<<<< starts your side, ======= separates the two versions, and >>>>>>> ends their side.
In more detail
The text between <<<<<<< HEAD and ======= is the version on your current branch, and the text down to >>>>>>> is the version being merged in. Resolving means replacing the whole block, markers included, with the text you want.
Related terms
- 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.
- ours and theirs — During a merge, ours is the branch you are on and theirs is the branch being merged in.
Taught in
- Resolving A Conflict, Line By Line — Advanced Git Internals & Distributed Workflows