Hey @EleanorKonik 
Yes I was discussing a related (but not identical) situation with @Licat yesterday on Discord, as well as in these 2 threads:
- Add a toggle to disable automatic merging of changes
- WikiLink - sometimes portion of the title gets appended after the closing
]]s - Bug reports
Right now, there are edge cases with sync no matter what system you use (Obsidian’s native Sync, Dropbox, GoogleDrive, iCloud, git etc). In general I don’t think this is a “solved problem” in computing; even giants like Google and MongoDB still struggle with sync and concurrency.
So, I was requesting more control over this auto-merge process. I’d like to see an on/off toggle for the auto-merge feature so we can choose what happens. But maybe instead of just on/off, some additional options would address your needs too:
- Silently Auto Merge (current behavior/default)
- Auto Merge with notification/log of changed files
- Prompt user (“sync conflict — keep file on left or right?”)
- Always Keep Both files (rename older one “Foo (conflict 2021-03-19_HHMMSS.ms)”)
I like the merge log idea you’ve got here, that would be helpful for sure. 