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

What does this comment mean?  That we need to do this in the future?  If so, file a bug.  If not, clarify the comment.