> > > rsync's --delete command line switch didn't work? > > rsync won't detect any conflicts, it'll just overwrite them. > Looked at unison? (I haven't recently, but I recall it doing roughly what you want)