Resolve a sync conflict
Compare This Device and Other Device, preserve both when uncertain, and avoid deleting the only good copy.
Last updated August 22, 2026Availability
- People completing this task in Yazora
- Free and paid plans
- Any workspace member with access
- Web, desktop, iOS, and Android
Before you begin
- Sign in and confirm the active workspace.
Before you start
A conflict means Yazora cannot safely order divergent document versions. The conflict panel lets you compare the current device and the other synchronized version.
Complete the task
- Open the conflict panel and review This Device and Other Device.
- Compare content and timestamps; do not choose by timestamp alone if either preview is incomplete.
- Choose the version to keep only when the desired content is clear.
- Choose Keep Both Versions when uncertain. Yazora saves the current-device version as a private conflict copy, then uses the other-device version here.
Check the result
The document returns to one canonical version, and Keep Both Versions preserves an additional private copy for manual comparison.