Changes between Version 19 and Version 20 of BazaarWorkflow
- Timestamp:
- 2009-08-23T21:25:51Z (15 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
BazaarWorkflow
v19 v20 44 44 == Rebasing == 45 45 46 See official [http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#rebasing Bazaar documentation on rebasing]. 46 See official [http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#rebasing Bazaar documentation on rebasing]. You will need the {{{rebase}}} plugin. 47 47 48 48 == Structured History == … … 83 83 84 84 {{{ 85 my_branch$ bzr merge bzr://bzr.helenos.org/head my_branch86 my_branch$ bzr commit -m "Merge latestmainline changes."85 my_branch$ bzr merge bzr://bzr.helenos.org/head 86 my_branch$ bzr commit -m "Merge mainline changes." 87 87 }}} 88 88