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

Taught in

References