merge conflict
merge conflict — When two branches changed the same bit of code in different ways, and git can't decide which to keep.
Merge conflicts look scary but they're just git asking "which version did you want?" You choose, and move on.
"I've got a merge conflict." "Resolve the conflict and push."