Bazaar

  1. Bug #113809
  2. Comment #3

Comment 3 for bug 113809

Revision history for this message
John A Meinel (jameinel) wrote : Re: complains about conflicts in figments of its own imagination

I should also mention, that if files have been removed, it is probably reasonable to auto-clear their conflicts.

So if we have a conflict of "file already exists moving existing file to file.moved". If you 'bzr rm file file.moved' it should clear the conflict entry