JWJW Sync

Handling merge conflicts: the same note edited on two devices

When you edit the same JW Library note differently on two devices, merging has to choose a winner. The Conflict Reviewer shows both versions side by side so you decide — nothing is lost.

Most of merging is effortless — notes unique to each device simply combine. The one case that needs a decision is a genuine conflict: the same note, edited differently on two devices, so the two backups disagree about what it should say. JW Sync never guesses silently; it hands the choice to you.

Step by step

  1. Load both backups

    At jwsync.org, load the .jwlibrary files from both devices. JW Sync compares them as it merges.

  2. Open the Conflict Reviewer

    If any notes conflict, the reviewer lists them. Everything that didn't conflict is already merged — this step is only for the genuine clashes.

  3. Compare side by side

    Each conflict shows both versions with a word-level diff highlighting exactly what differs. “Suggest best” can pick the fuller version for you, or you choose the one to keep — per note.

  4. Finish and restore

    Once every conflict is resolved, download the merged file and restore it. Both devices now agree, with your chosen version of each note.

Do it now — free, in your browserJW Sync merges, edits and analyses .jwlibrary backups entirely on your device. No account, no uploads, nothing installed.Open JW Sync →

Why this beats just keeping the newest

“Newest wins” quietly deletes edits you may have wanted. Maybe the older version had a paragraph you removed by accident on the other device. Seeing both, word for word, means you never lose text without knowing it — which is the whole point of merging instead of overwriting.

How conflicts happen in the first place

Usually from editing offline on two devices between merges, or restoring an old backup and then adding to it. Merging on a regular schedule keeps the number of conflicts small and the differences fresh in your memory.

Frequently asked questions

Will I have to review hundreds of conflicts?
Rarely. Only notes edited differently on both sides conflict; new notes, and notes changed on just one device, merge automatically. Most merges have a handful of conflicts or none.
Can I change my mind after choosing?
Yes — nothing is written to a device until you restore the merged file, and your original backups are never modified, so you can redo the merge.

Related guides