[pmontra]

I did use Unison but I lost a lot of time merging changes. Then I switched to syncthing that also work on my Android devices. Syncthing has it's share of pain points, most notably that out of sync / override changes button that many people don't understand. It's a very bad piece of UX and it makes people wonder if they are about to lose some data on one or both sides of sync. They should do without it at least when sync is not bidirectional.

[mulle_nat]

I never merge changes. I run my unison with `-batch -prefer newer`, so I never get queried. In the very, very rare case (like maybe once every few years), where I feel I lost a file to unison, I have to retrieve a backup. It would assume that in a multi-user setup, this could be trickier.