For all non-trivial sync conflicts (if file difference isn’t just white space, etc), just keep all versions of the note. That’s it. simple. Doesn’t hurt to add this option and i imagine it’s easy to implement.
Much less of a chance of data loss going unnoticed.
IK there have been similar FRs (example), but for some reason they all suggest inferior UX solutions. Why manually constantly check some sync log history or worry if you missed a “sync with conflict merge happenned” notification when this could be easily added as an option?
Even if i notice after 2 yrs that some note had sync conflicts and some data was lost in the main version, i can just go check the other version and be sure.
Absence of this prevents me from using Obsidian sync and I don’t think im the only one.
A side by side view for the conflicted note, shared scrolling, and highlighting different lines would be a bonus, and totally not necessary for the start.