= hg merge multiple heads = do this automatically: http://kiln.stackexchange.com/questions/1696/how-to-fix-multiple-heads │hg merge abort: branch 'default' has 4 heads - please merge with an explicit rev (run 'hg heads .' to see heads) │hg heads . changeset: 336:b27ea86a9c9e tag: tip parent: 332:d0f91aad5f84 user: Jeff Hammel date: Wed Jun 19 09:59:02 2013 -0700 files: .gitconfig description: alias to make patch changeset: 335:a9d3f1210506 parent: 311:a25eb7e42889 user: Jeff Hammel date: Tue Jun 18 16:50:10 2013 -0700 files: .emacs description: what a piece of crap; disablign for now since i dont use anyway changeset: 334:5b67dd5ce0ba user: Jeff Hammel date: Tue Jun 18 15:44:55 2013 -0700 files: .bashrc description: update virtualenv before upgrading changeset: 227:9e5563ca20da user: Jeff Hammel date: Wed May 16 08:58:47 2012 -0700 files: .bashrc description: remove umask │hg up -C 336 resolving manifests 0 files updated, 0 files merged, 0 files removed, 0 files unresolved │hg merge -r 335 resolving manifests getting .emacs 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) │hg commit -m 'first commit' .emacs committed changeset 337:4d5d5097686f │hg heads . changeset: 337:4d5d5097686f tag: tip parent: 336:b27ea86a9c9e parent: 335:a9d3f1210506 user: Jeff Hammel date: Wed Jun 19 10:46:01 2013 -0700 description: first commit changeset: 334:5b67dd5ce0ba user: Jeff Hammel date: Tue Jun 18 15:44:55 2013 -0700 files: .bashrc description: update virtualenv before upgrading changeset: 227:9e5563ca20da user: Jeff Hammel date: Wed May 16 08:58:47 2012 -0700 files: .bashrc description: remove umask │hg up -C 337 resolving manifests 0 files updated, 0 files merged, 0 files removed, 0 files unresolved │hg merge -r 334 resolving manifests getting .bashrc getting .fluxbox/keys 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) │hg commit -m 'second commit' 608 hg pull 609 hg push 610 hg st 611 hg st -q 612 hg merge 613 hg heads . 614 hg st 615 hg st -q 616 hg pull 617 hg update 618 hg merge 619 hg heads . 620 hg up -C 336 621 hg merge -r 335 622 hg commit -m 'first commit' 623 hg heads . 624 hg up -C 337 625 hg merge -r 334 626 hg commit -m 'second commit' 627 hg heads . 628 hg up -r 338 629 hg merge -r 227 630 hg heads . 631 hg commit -m 'wtf' 632 hg heads . 633 hg pull 634 hg st -q 635 hg push 636 hg pull http://mercurial.selenic.com/wiki/MergeMultipleHeads