10 · Version Control
Merge Conflict
When two changes collide
When two branches changed the same lines differently and git can't tell which should win, so it stops and asks a human to choose.
Concrete example
You and a teammate both edited line 10; git pauses and makes you pick the right version.
Why it matters
The famous “git is scary” moment — but it's really just a choose-one prompt.