merge conflict
What happens when two branches changed the same lines and Git can't decide which to keep.
A merge conflict arises when both sides changed overlapping lines; Git writes <<<<<<< / ======= / >>>>>>> markers for a human to resolve.
Examples
Git marks the clash with
<<<<<<<,=======and>>>>>>>lines around both versions.
See also