Pull and merge remote branch changes with multiple heads

Question

When my current branch has more than 2 heads and I try to pull and merge with the remote changes, I get the following exception:

abort: branch 'default' has 3 heads - please merge with an explicit rev (run 'hg heads .' to see heads)

I am struggling to resolve this issue.

Answer 1

您需要使用“ hg merge -r rev”与显式修订合并。