Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changes between Version 2 and Version 3 of BazaarWorkflow


Ignore:
Timestamp:
2009-08-16T18:29:28Z (10 years ago)
Author:
Jiri Svoboda
Comment:

Resolve merge conflict with rebasing.

Legend:

Unmodified
Added
Removed
Modified
  • BazaarWorkflow

    v2 v3  
    7070my_branch$ bzr pull
    7171}}}
     72
     73Again, the push might have failed if somebody else pushed since you created your {{{head_clone}}}. In that case probably the best idea is to try and rebase your merge commit to the new mainline head.