Granite
Sign in Start free
Sync and offline

What is a conflict copy?

When two devices change the same lines before syncing, Granite keeps both: one in the note, the other next to it as a copy.

Sometimes two devices change the same lines of a note before they've had a chance to sync, for example when your laptop was offline. Granite never throws one of the edits away. Instead:

  • the version that reached Granite first stays in the note, and
  • the other version is saved next to it as a conflict copy, on every device.

What to do with it

  1. Open the note and its conflict copy side by side (run "Split right" from the command palette).

  2. Copy anything you want to keep from the conflict copy into the note.

  3. Delete the conflict copy.

When you edit a note together with someone live, edits merge automatically and you won't get conflict copies. See live editing.