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

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Google+ photo

You are commenting using your Google+ account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s

%d bloggers like this: