product-example checked
Microsoft Office coauthoring conflict errors
Documents coauthoring conflict states where local data is safe but cannot resume coauthoring until users resolve errors, save a copy, discard, refresh, review recovered conflicts, and accept or reject conflicting changes.
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. | Microsoft Office supports save-copy and discard recovery, conflict view navigation, and accept or reject decisions for recovered changes. |
| 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. | Microsoft Office supports local-safe conflict errors, save-copy and discard recovery, conflict view navigation, and accept or reject 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. | Microsoft Office conflict review provides adjacent evidence for preserving data, navigating conflicts, and accepting or rejecting conflicting changes. |
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: Microsoft Support. Last checked: .