Git stops and asks you to decide when the same lines were changed on both sides. Here's the sequence that gets you out cleanly.
git merge or git rebase stops with "CONFLICT (content): Merge conflict in <file>". git status lists the file under "Unmerged paths".
Open the conflicting file — Git marks each conflict with <<<<<<<, =======, and >>>>>>> around the two versions.