In the past day I stumbled across some text that may have been duplicated as long as a month ago.
Then, minutes ago, a few more conflicts happened (no notification, just the log). A couple of the files were ones I’d been working with while merging my weekly notes, but one wasn’t. That one, I have been sometimes editing in an outside app, which leaves fewer changes in the history (and I have to remember to open Obsidian after using the other app, so it will sync).
Some of these files are kind of long, and even with the version history and “show changes”, I basically took it on faith that I was restoring to a good version and not losing data in the process.