Bazaar

  1. Bug #409555
  2. Comment #1

Comment 1 for bug 409555

Revision history for this message
John A Meinel (jameinel) wrote :

I'm pretty sure that "bzr remerge" is intended as "please re-try the merge from scratch". What you might be looking for is:

bzr remerge `bzr conflicts --text`

Though perhaps:
  bzr remerge --only-conflicts
Or something along those lines would be a better way of invoking it?