News for hackers. Stuff that matters.
Re:I use Org Mode for personal logging/journalling by kkleindev on Monday February 28, 2022 @04:39AM (#30498076)
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.
Re:I use Org Mode for personal logging/journalling by kqr on Monday February 28, 2022 @05:31AM (#30498386)
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.