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

Taught in

References