How to get rid of a bad branch merge?

[Pierre Asselin]

Steven <siyuz.m+mercurial at gmail.com> wrote:
> [-- multipart/alternative, encoding 7bit, 42 lines --]

>     [-- text/plain, encoding 7bit, charset: ISO-8859-1, 17 lines --]

> Say I have 3 branches, A, B, and C

> C contains merges from branch A, and A contains merges from C.

> If someone accidentally merge B into A, we can no longer merge A and C
> because they will have to essentially merge part of B and C.  [ ... ]

Was the bad merge discovered immediately, or after some A <--> C merges ?


-- 
pa at panix dot com