When two people change the same code and Git refuses to choose, forcing a human to referee.
Came back from vacation to 200 merge conflicts and a passive-aggressive commit message.
+947
Definitions of Merge Conflict
1 definitionThink they got it wrong?
Add your own definition of Merge Conflict