semantic conflict
A clash in meaning between two changes that merge cleanly as text but break the program together.
In more detail
For example, one branch renames a function while another adds a call to the old name; Git sees no overlapping lines. Only a build or tests notice, which is one reason continuous integration exists.
Related terms
- merge — Combining the work of two branches into one, either by moving a branch forward (a fast-forward) or by recording a merge commit.
- continuous integration — Automatically building and testing every change as soon as it is pushed, so problems are caught early.
- test suite — A collection of tests run together to check a piece of software.
Taught in
- Trunk-Based Development Versus Git Flow — DevOps & Site Reliability Engineering