Changes between Version 1 and Version 2 of BazaarTheory


Ignore:
Timestamp:
2009-08-16T19:21:06Z (15 years ago)
Author:
Jiri Svoboda
Comment:

Merging a feature branch

Legend:

Unmodified
Added
Removed
Modified

  • BazaarTheory

    v1 v2  
    1818
    1919When you create a new branch, it will be consistent with the main repository. However, if you merge the mainline head into your branch, then you used the mainline as the right parent. This means that the mainline is not the main branch in your repository (because that passes through the left parent). In this case you must not push to the main repository!
     20
     21== Merging a Feature Branch into the Mainline ==
     22
     23Since it is not possible to merge directly to the central repository ''M'', we must do the following in order to merge our private branch in ''A'': First create a clone ''M,,C,,'' of ''M'' with {{{bzr branch}}}. Then merge ''A'' into ''M,,C,,''. This means we take the mainline in ''M,,C,,'' as the left parent and the feature branch in ''A'' as the right parent. In the end the main branch in ''M,,C,,'' will be a superset of the main branch in ''M'' (the mainline). Now we are free to push from ''M,,C,,'' to ''M''.