2 Apr
2012
2 Apr
'12
11:56 p.m.
on Mon Apr 02 2012, Martin Geisler <mg-AT-aragost.com> wrote:
In svn the blocking merge is recorded in the system. So whenever anyone will merge the stable into dev svn will know which changes not to merge. How does hg/git help in communicating this? Imagine a branch where many developers do bugfixes and someone will once a week merge things into dev. How shall he know which changes to skip?
You cannot skip changes -- you really must merge them from stable into dev (really 'default' when using Mercurial). What you can do is to merge-and-ignore:
hg update default hg merge stable hg revert --all --rev default
For completeness, in Git this is spelled git merge -s ours stable -- Dave Abrahams BoostPro Computing http://www.boostpro.com