Conflicts are rare. They happen only when the same note is edited on two devices before either had a chance to sync, typically because one of them was offline. When the second device syncs, Caliu notices the note changed elsewhere and asks you to decide, rather than silently overwriting either version.
Nothing is lost in the meantime: both versions are kept until you resolve the conflict.
In the web app
The sync indicator in the sidebar turns red and shows how many notes are in conflict. Click it to open the resolve dialog, then choose:
- Keep local version: what you wrote on this device wins.
- Keep server version: what synced from your other device wins.
Your choice applies to the conflicted notes and sync resumes normally.
On iPhone, iPad, and Mac
The apps show both versions of each conflicted note next to each other (side by side or stacked, depending on your screen), so you can read them before choosing which to keep. Conflicts are resolved one note at a time. If the conflicted note is already open, a button in the editor toolbar takes you straight to it.
Avoiding conflicts
Just let devices sync before switching between them. Pins, tags, and archive changes are designed to merge cleanly; only competing edits to a note's content need your decision.