Merge conflict

Also called: merge conflicts, git conflict, conflicting changes

What happens when two branches change the same lines of code in different ways, so version control cannot combine them on its own. A person has to choose which change to keep.

For example: Two developers both edited the pricing table. Merging the second pull request stops with a merge conflict until one of them picks the right numbers.