Merge conflict
Git can't automatically combine two changes on the same line — you have to manually pick which one to keep.
Markers <<<<<< and ======= show the conflict. Resolve → commit. Prevent: small PRs, frequently rebased, short-lived feature branches.