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.
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. | 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. |
Comparisons supported by this source
- Conflict resolution vs conflict state vs review before submit vs autosave recovery
Confluence supports overlap conflict display and user choices after concurrent editing.
- Conflict state vs sync state vs draft state vs error state
Confluence supports conflict display for overlapping concurrent edits and offers continue editing, overwrite, and cancel outcomes.
- Merge conflict resolver vs conflict resolution vs conflict state vs review before submit
Confluence conflict display helps distinguish document conflict choices from repository merge conflict resolution.
Evidence Role
This source is treated as product-example evidence. Its value comes from the specific claims and setting described above.
Publisher: Atlassian. Last checked: .