I'm a big Unison fan, but it can be finicky. You need the same version of Unison on both sides of the sync, and that's sometimes hard to do.
However, it solves the problem of when there are changes on both sides and you want to reconcile them.
However, it solves the problem of when there are changes on both sides and you want to reconcile them.