Merge conflict
also: merge conflicts, conflict markers
When two branches changed the same lines in different ways, Git can't tell which version to keep, so it stops and asks a person to decide.
A state during a merge, rebase, or pull where Git can't combine changes automatically, because both sides edited the same lines or one side deleted a file the other changed. Git marks the conflicting sections with <<<<<<<, =======, and >>>>>>> and waits for a resolution.
Two people edit the same sentence in shared notes. One writes "meet Tuesday", the other "meet Friday." Nobody can combine those automatically. Someone has to pick.
Agents can resolve conflicts, but choosing wrong silently drops someone's work. You should know when a conflict happened and what was chosen.
There's a merge conflict in pricing.ts: main changed the tax rate, and this branch changed the rounding on the same lines. I suggest keeping both changes. Please confirm.
If you hit merge conflicts, don't resolve them automatically. Show me each conflict, what each side changed, and what you recommend.
Thinking a merge conflict means something is broken or lost. It's Git being careful. Nothing is lost unless someone resolves it the wrong way.