You’ll want to see this other bug report too: Obsidian Sync: Conflict File generated but user has not independently modified on multiple devices
And you may want to change your Sync settings to create conflict files instead of automatically merging.
You’ll want to see this other bug report too: Obsidian Sync: Conflict File generated but user has not independently modified on multiple devices
And you may want to change your Sync settings to create conflict files instead of automatically merging.