Comment 1 for bug 600097

Revision history for this message
Vincent Ladeuil (vila) wrote :

Right, I'll note that you need to repeatedly *ignore* the conflicts without any attempt to solve them nor to get rid of them to end up in this situation, in your case, I'd say at least 4 times.

I think bzr is trying to tell you that you really should cleanup your tree before doing further merges
(or any operation that can produce conflicts) and does it by being more and more vocal.

Cleaning this mess may require 'bzr resolve --all', 'bzr clean-tree --detritus' (use --dry-run first for the later).