bzr resolve --action=ARG

Stephen J. Turnbull stephen at xemacs.org
Thu Sep 30 07:40:08 BST 2010


John Arbash Meinel writes:

 > - From the help message:
 > 
 >   action:
 >     --action=ARG        How to resolve the conflict.
 >     --done              Marks the conflict as resolved
 >     --take-other        Resolve the conflict taking the merged version into
 >                         account
 >     --take-this         Resolve the conflict preserving the version in the
 >                         working tree

Ungh.  How ... unpythonic. :-(



More information about the bazaar mailing list