> Anyone know of anything like this? It doesn't seem like it > should take a lot to sit on top of rsync and resolve conflicts. You might also consider dfp (but it has no GUI): http://www.homepages.lu/pu/dfp.html