On May 12, 2012 6:54 AM, "Stefan Sperling" <[email protected]> wrote: >... > Why have a 'resolved' command at all if removing these files is the > functional equivalent?
Two ways to resolve. > It isn't really the technical equivalent since > even 1.6 has to clear conflict data from entries files in any case. It basically is because "everywhere" we check for a recorded text conflict, we double-check to see if the conflict files were removed. Removal suppresses the conflict. > All > that happens is that a 'resolved' notification is suppressed if the helper > files are missing from disk. As Bert noted, status is cleared. Commits can occur. Etc. Much more than notifications. > What's the value in that? This is inconsistent > behaviour. And I doubt any of our users are relying on not receiving > this notification. You can't assume that. Cheers, -g
