Do not delete conflicted copies when removing delete nodes in rsync's patch
Fix #372 - Do not create conflicted copies if the client has a newer version of a file, instead upstream that file