Neither wins — that is the point of the copy, so nothing is lost. Merge them by hand (the diff is usually a few lines), delete the copy, and you are done. To avoid it: turn on Settings → Sync → Merge edits to the same note. With it on, Quillstone merges line-level edits automatically and only makes…
Jump to postI edited the same daily note on my laptop and phone while the phone was offline. Now I have 2026-10-03 (conflicted copy).md next to the original. Which one wins, and how do I stop this?
Neither wins — that is the point of the copy, so nothing is lost. Merge them by hand (the diff is usually a few lines), delete the copy, and you are done.
To avoid it: turn on Settings → Sync → Merge edits to the same note. With it on, Quillstone merges line-level edits automatically and only makes a conflicted copy if both devices changed the same line.
Turned it on. No conflicts since. Thanks.
Good to know before it happens to me.