Merge Conflict
In plain terms
A conflict that occurs when merging divergent branches.
Going deeper
A merge conflict happens when two branches change the same lines and Git can't auto-resolve, marking the file for manual fixing. You choose what wins.
Under the hood
Conflict markers (<<<<, ====, >>>>) show both sides; resolving means editing then committing.
Examples
git merge conflicts, resolving markers, branch integration, pull conflicts.
Think of it like...
Like merging two edited drafts where the same paragraph differs, you pick the final wording.