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

Add some more to this comment, indicating why we're doing this at all.