Merging multiple heads

[Dennis Brakhane]

Am 06.10.2011 23:46, schrieb Niklas Rosencrantz:
> You really helped me and hg revert nailed it. I was very frustrated
> that there wasn't a oneliner to solve it but there was. A partner told
> me to switch to github, isn't that stupid to completely change
> everything just because I had to learn.

Believe me, git also has its fair amount of gotchas, and a newbie
can easily get his repo in a state where he requires help to be
able to get out of the mess he dug himself into.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 554 bytes
Desc: OpenPGP digital signature
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20111010/b681f655/attachment.asc>