[kkleindev]

My current setup is also slightly dissatisfying in that regard. What's nice (or rather a consolation) about orgzly - the mobile app I use - is that upon conflict, it explicitly offers to either choose the remote or the local version. At first I was worried it would simply attempt to always overwrite based on the local version.

[kqr]

It combines even more nicely with Syncthing, which creates a copy on conflict, which can then easily be merged with ediff-files once I get back to a computer.