Yes, I support what Aaron suggest, that a conflicted copy is created in the org sync directory.
This solution would work for my workflow
Strongly agree with this suggestion. By the way, Dropbox's desktop client's behavior when the mobile client syncs first is to create a separate file with "(HOSTNAME's conflicted copy DATE)" or some similar format. appended
Thank you for this suggestion. I've made a note of this and will review for a future update.
You can view the full text of a file when viewing a version however copying anything more than a small amount of a large file is a pain as selecting text is tricky.
Magnus
In Beorg you can either "revert" or "view" older versions of org-files.
I would like the possibility to "save" older versions.
In case of sync conflicts, I can then save the Beorg-version and use "ediff" in emacs to stitch the two conflicted versions together.
1 person likes this idea