Software Engineering · Version Control
When two branches have made incompatible changes to the same part of the same file, requiring a human to decide what the final version should be.
In practice: Long-lived branches accumulate conflicts — merging frequently from main keeps the delta small and conflicts trivial to resolve.