Was the "conflict" resolved (bzr resolve filename.OTHER) before explicitly deleting it?
I'm thinking that it might consider both files the "same" before its resolved, and therefore the deletion might have two different outcomes.
Regardless, I agree that it shouldn't delete both files.
Was the "conflict" resolved (bzr resolve filename.OTHER) before explicitly deleting it?
I'm thinking that it might consider both files the "same" before its resolved, and therefore the deletion might have two different outcomes.
Regardless, I agree that it shouldn't delete both files.