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.