Phrase
What it actually means
Git can’t reconcile two code changes automatically.
Example Usage
I hit a merge conflict after pulling.