IMHO the best way would be using git, which is literally made to resolve this kind of conflicts and it’s very battle tested. I’ve always had issues syncing notes until I switched to git.
As far as I know, git can’t be used for real-time synchronization and simultaneous collaborative editing. But I’ll give it some thought
is simultaneous collaborative editing a real need though? I’d say org notes are usually edited by a single person, often from multiple devices, unless you are trying to create a Google Docs competitor, I don’t think that’s a feature that is actually needed.
git also has the advantage of complete history and easy rollbacks.
I’ve given up using Orgzly because the syncing is atrocious, it has restored deleted notes multiple times. I’m now using Organice with gitlab backend and it works very well.
I need to think about it. The server functionality is also needed to share notes, although it may be possible to combine it with git storage as well
