Luca Pireddu < XXXX@XXXXX.COM > writes:
This is an unsolvable problem IF you changed the same files on both
machines. On the other hand if you change file a on A and b on B then doing
rsync both ways works.
Ie, use the newer conditional and transfer files from A to B and then from
B to A.
-u, --update update only (don't overwrite newer files)
This forces rsync to skip any files for which the destination
file already exists and has a date later than the source file.
In the currently implementation, a difference of file format is
always considered to be important enough for an update, no mat-
ter what date is on the objects. In other words, if the source
has a directory or a symlink where the destination has a file,
the transfer would occur regardless of the timestamps. This
might change in the future (feel free to comment on this on the
mailing list if you have an opinion).