merge conflict
An error state that occurs when two branches in a version control system contain incompatible changes to the same part of a file and cannot be automatically combined.
Full Definition
A merge conflict arises during a merge or rebase operation when version control software cannot automatically reconcile differing edits made to the same lines or sections of a file. Resolving a merge conflict requires manual intervention by a developer. In editorial work, the term is always written as two words without a hyphen. Editors should not confuse 'merge conflict' with 'merge request' (a synonym for pull request in GitLab). Documentation on merge conflicts frequently uses imperative-mood instructions and inline code blocks, both of which require careful proofreading.
Usage
Usage note: Write as two unhyphenated words. Do not confuse with 'merge request', which is a platform feature, not an error state.
In Context
- "Fix any merge conflicts in `config.yaml` before requesting a code review." — Contributor workflow guide
- "The CI pipeline fails automatically when a merge conflict is detected." — CI/CD pipeline documentation