Merging between branches in Mercurial
March 16, 2011
Just a tip for not forget how to merge between branches properly. Merge from stable to default, in this example we are on stable:
(All changes has to be be committed)
hg commit -m "My new features"
hg pull --rebase
hg push
hg update default //change to default branch
hg merge stable // merge the stable changes
hg commit -m "Merge from stable to default"
hg push
(Remind go again to the proper branch, if needed)
hg update stable //change to stable branch
Advertisement
