How to Recover Two Offline Edits to One Obsidian Diary Note
If you edited the same Obsidian diary note offline on two devices, preserve both versions before deciding what to keep. Compare them and assemble one reviewed note, keeping the originals until you have reopened and checked the result. This guide covers Obsidian Sync; other sync tools can behave differently.
First, keep the two edits safe
Pause your editing on both devices. If they are still offline, make a separate copy of each version somewhere outside the synced vault, using distinct filenames such as `Diary-device-A-backup.md` and `Diary-device-B-backup.md`. Do not rename, delete, reinstall, reset, or force-sync anything as a first step: you want independent copies in case a later action changes what is in the vault. If a device has not yet reconnected, avoid reconnecting it until its note has been copied.
A conflict can arise when both devices change one file before syncing. Obsidian’s documentation explains the available handling options, but the intended meaning and order of diary passages still require your review. [Obsidian Sync conflict troubleshooting](https://obsidian.md/help/sync/troubleshoot)
Choose how Obsidian Sync handles the conflict
In Obsidian 1.9.7 and later, select **Settings → Sync → Conflict resolution → Create conflict file** on each device. The default automatic merge may need cleanup. Settings are device-specific. [Obsidian Sync conflict troubleshooting](https://obsidian.md/help/sync/troubleshoot)
After reconnecting and checking Sync activity, inspect the original and the file named `original-note-name (Conflicted copy device-name YYYYMMDDHHMM).md`. The latter holds edits from the device detecting the conflict; the original retains the remote version. Neither label tells you which wording you intended to keep. [Obsidian Sync conflict troubleshooting](https://obsidian.md/help/sync/troubleshoot)
Compare both notes and make a reviewed merge
Open the original and conflict copy side by side. Compare the full text from top to bottom, including the opening, dates, paragraphs near the point where you worked, and the ending. Mark content that appears only in one copy. Diary text may have identical-looking paragraphs or edits to the same sentence; decide based on the meaning and your memory, not only on matching lines.
Create a third file with a temporary name, such as `Diary-merge-review.md`. Copy in the material you want to retain from both versions, resolving overlaps manually. Keep the sequence understandable: if the entries cover events in chronological order, preserve that chronology where you can; when you cannot tell which of two revisions was intended, retain both with a clear note to revisit rather than silently choosing. This is a cautious editorial method, not an Obsidian feature or an automatic merge guarantee.
Before replacing the canonical diary note, check that the review file contains every passage you meant to save. Close and reopen it, then compare it once more against both source copies. If the note is long or the decision is unclear, leave the copies in place and return to the merge later.
Use version history as an additional recovery route
Obsidian Sync keeps note versions, and its version-history view lets you inspect previous content and restore a version. The steps are to open the note’s **Open version history**, select a version to inspect, and use **Restore** only if you decide that version is the one you want; restoration replaces the note’s contents. The retention period depends on the Sync plan, so version history is a fallback, not a substitute for making independent copies first. [Obsidian Sync version history](https://obsidian.md/help/sync/version-history)
For conflict timing, inspect the Sync log for “Conflict” or “Merge Conflicts.” For a missing note, use the documented deleted-file version-history view. Keep any recovered text separate until it has been compared with your backups. [Conflict troubleshooting](https://obsidian.md/help/sync/troubleshoot) [Version history](https://obsidian.md/help/sync/version-history)
When is it safe to remove the copies?
Only after the final note is saved, reopened, and checked against both preserved texts should you consider cleanup. Keep the originals until you are satisfied that the merged note contains the passages you want. If you delete them, verify the canonical diary note remains intact after Sync has completed on both devices.
Do not generalize this behavior to every notes app or file-sync service. For example, Syncthing documents that simultaneous differing file edits can produce a `.sync-conflict-...` file; it also says such files are treated as normal files and propagated to devices. That is distinct from Obsidian’s documented naming and conflict controls, and illustrates why you should identify which product made the copy before removing it. [Syncthing: Understanding Synchronization](https://docs.syncthing.net/users/syncing.html#conflicting-changes)