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

I don't fully understand this comment.  I think it needs more context.  It seems odd, on its face, to be talking about a path to be upstreamed during a downstream.