GitLab merge conflicts
Documents conflict blocks, source and target changes, conditions for resolving conflicts in the UI, interactive Use ours and Use theirs choices, inline editing for complex conflicts, commit messages, and manual resolution when UI limits are exceeded.
What this source can teach
Use this source to inspect a concrete implementation and the decisions visible in its context.
- Start with the original. Open the source and find the guidance or example relevant to your task.
- Trace the connection. Use the claim notes below to see how this site applies the source to specific patterns.
- Check the setting. Compare the source's platform, people, and constraints with your own decision.
Pattern Decisions This Source Supports
| Pattern | Supported decision | Required contract | Claim note |
|---|---|---|---|
| Conflict resolution | Choose conflict resolution when users need a workflow for deciding, merging, skipping, or committing one or more conflicts after they have been detected. | The resolver opens from a known conflict and keeps users oriented to the affected object, conflict number, and total unresolved count. | GitLab supports conflict blocks, Use ours and Use theirs choices, inline editing, commit messages, and manual resolution when UI limits are exceeded. |
| Conflict state | Choose conflict state when two or more valid versions overlap and a choice, merge, save-copy, discard, or policy resolution is required. | Conflict detection stops silent overwrite and keeps every competing value recoverable. | GitLab supports conflict blocks, UI resolution criteria, Use ours and Use theirs choices, inline editing, and commit-based resolution. |
| Merge conflict resolver | Choose merge conflict resolver for source-control branch conflicts with files, hunks, target/source branch labels, conflict markers, and a resolution commit. | The resolver opens from a known merge conflict and keeps branch pair, file path, hunk number, and total unresolved count visible. | GitLab documents conflict blocks, source and target changes, Use ours and Use theirs choices, inline editing, commit messages, and manual resolution when browser resolution is not supported. |
Comparisons supported by this source
- Conflict resolution vs conflict state vs review before submit vs autosave recovery
GitLab supports Use ours and Use theirs choices, inline editing, commit messages, and manual conflict resolution boundaries.
- Conflict state vs sync state vs draft state vs error state
GitLab supports conflict blocks, UI eligibility rules, interactive Use ours and Use theirs choices, inline editing, and commit-based resolution.
- Merge conflict resolver vs conflict resolution vs conflict state vs review before submit
GitLab documents source and target conflict blocks, Use ours and Use theirs choices, inline editing, commit messages, and manual resolution limits.
Evidence Role
This source is treated as product-example evidence. Its value comes from the specific claims and setting described above.
Publisher: GitLab Docs. Last checked: .