You might want to try allwaysync
http://allwaysync.com/ I was introduced to this free software tool for another purpose but it may fit your needs. One thing that is really nice about this product, it has a usb version. A small program you can add to a usb drive and then use the usb drive as a place to resolve sync issues across different PC's, etc. It can also access network drives.