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

We should expand this comment to say that we want to make a conflicted copy (i.e., allow the patch to happen) if the version is different than ours, since it means another client has updated the file since we last synced, and there are now 2 versions, which need to get resolved.