Fix #399 - don't track changes to conflicted copies in path to sync

The only thing I'm unclear about is how to really hit this issue in a test that will 100% fail.  Make sure I'm doing what you'd expect below.

r? @gideonthomas