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

There was a scenario that I had in mind where we would need this. I just can't remember (something about the fact that reverting a file back to its original version e.g. removing an 'a' and then adding it back, will result in the same checksum even though we wouldn't want that case)...will get back to this in a bit