merge conflict
nounUK /mɜːdʒ ˈkɒn.flɪkt/
US /mɝːdʒ ˈkɑːn.flɪkt/
A problem that happens when two people change the same part of a file and the computer cannot decide which change to keep.
When both teammates edited the same line, Git showed a merge conflict that they had to fix by hand.
RELATED WORDS
OTHER MEANINGS
2. A disagreement between two groups that join together and cannot agree on how to work as one.
The merger failed because of a merge conflict between the two companies' leaders.
3. A situation in a game where two players or pieces try to move into the same spot at the same time.
The referee stopped play to resolve a merge conflict on the board.
4. A clash between two sets of rules or plans that must be combined into one.
The new schedule caused a merge conflict with the old holiday policy.