Bazaar

  1. Bug #113809
  2. Comment #1

Comment 1 for bug 113809

Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 113809] complains about conflicts in figments of its own imagination

I'm not sure what you are saying is the bug. Clearly you have been
confused.

In this case, if you had done 'bzr resolved debian/changelog' I expect
it would have addressed the conflicts immediately.

-Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.