Two-way Confluence sync conflict policies
The problem
Two-way sync sounds convenient until both sides edit the same page. Blind overwrite destroys someone’s work; ignoring conflicts leaves wikis silently wrong.
How Churrie Sync helps: one-way remains the default (origin wins). When two-way routes are enabled, each destination carries a conflict policy instead of blind overwrite.
Conflict policies
| Policy | Behavior |
|---|---|
| Overwrite | Incoming sync replaces destination content |
| Review required | Destination flags conflict; author resolves in UI |
| Last write wins | Compare sync timestamps; newer event wins |
Page-level conflict UX
- Churrie Sync pill shows Conflict status on affected pages
- Per-page dialog — side-by-side incoming vs local
- Accept incoming or Keep this page
Receiving routes can require X-Sync-Api-Key per origin link. Generate and revoke named inbound keys in admin.