Fix #372 - Do not create conflicted copies if the client has a newer version of a file, and upstream that file

Add a comment here explaining why `ENOENT` errors are OK, and that you didn't do this accidentally.