product-example checked
Atlassian Confluence concurrent editing and merging changes
Documents concurrent editing notices, automatic merging for non-overlapping edits, conflict display for overlapping edits, and user choices to continue editing, overwrite, or cancel while preserving another person's saved edits.
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. | Confluence supports conflict display for overlapping edits and choices to continue editing, overwrite, or cancel while preserving another person's saved edits. |
| 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. | Confluence supports concurrent edit notification, automatic non-overlap merge, conflict display, continue editing, overwrite, and cancel choices. |
| 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. | Confluence concurrent editing provides adjacent evidence for overlap conflict display and explicit choices after automatic merging cannot complete. |
Evidence Role
This source is treated as product-example evidence. Use it to validate the decision rules above, not as a visual style reference.
Publisher: Atlassian. Last checked: .