Mercurial Branch Merging

Facing a difficult merge because one hasn’t happened in quite awhile with mercurial? You don’t HAVE to merge the tip of a branch to the target branch.Figure out the difficult changeset, merge the changesets before the difficult one, then merge the difficult one, and finally merge everything after that. Obviously you can do several iterations if there are several messy ones.

Here’s a pattern for it:
It's only fair to share...
Share on FacebookGoogle+Tweet about this on TwitterShare on LinkedIn

Leave a Reply