Avoiding massive merges

[Gregory Collins]

John Levon <levon at movementarian.org> writes:

> Moving from the branched 3.0.4 to the branched 3.1 involves a ginormous
> merge. Any suggestions for a strategy? I think I need an 'hgmerge' that
> simply accepts the new version of the clashing files, or is there a
> better way?
>
> What do other people do in such circumstances?

Merge using emacs ediff, and hit "$$" and "##" in the ediff command
window to force it to skip uninteresting chunks. I can usually chew
through a tree pretty quickly this way.

G.