Using Obsidian on 2 computers in a Onedrive folder, I noticed that when the same note had taken different paths on the 2 devices, a new note was created on one of them appending the other device’s name to the note name.
In case of heavy editing or a computer being offline for a long period of time, it might be useful to be able to automatically highlight the 2 notes’ differences before merging the edits.
5 Likes
There is some hope that this kind of functionality will be part of the Obsidian Sync feature currently on the roadmap.
Some folks like to use Git for syncing to help navigate these kinds of conflicts, too.
3 Likes