Comment 2 for bug 355964

1 & 2. I suspect that when the conflict happened during the merge, bzr did the equivalent of "bzr mv proposal.tex proposal.tex.THIS". I don't think bzr should do that, it's just confusing.

3. I think this is intentional, so that conflict files are extra visible in "bzr status" output. Usually when you do "bzr resolve foo" any foo.BASE/THIS/OTHER files will be automatically deleted. Again, I'm not sure that describing conflict dropping as "unknown" is a good idea, but it doesn't seem unreasonable to me either. In combination with 1 & 2 it makes the situation look even worse though, because a single conflict has caused several different types of changes.