On Wed, Apr 01, 2009 at 12:43:38AM -0500, Michael Johnson <redbeard@xxxxxxxxxxxx> wrote: > Anyway, I decided to try an experiment, as I had mentioned to someone that > if I couldn't get this bug tracked down, I'd have to do the merge > manually. So... I figured out the common ancestor (I used git show-branch, > but I'm betting there's an easier way), and merged the ancestor + 1 of the > other branch into my HEAD. It segfaulted. So, I tried the resolve strategy > at the same point. Amazingly, it worked. And a default recursive merge > handled the rest. I initially replied to this thread as I wasn't sure if it's a bug in merge-recursive or builtin-merge itself. I'm not that familiar with merge-recursive, that's why I didn't reply so far. ;-) > In short, I don't personally need a fix right now, but I can help figure > out what is broken with it. If you don't need rename detection, you can merge with '-s resolve', I think that would do what you need and it avoids the problematic codepath.
Attachment:
pgpf4QPELhr55.pgp
Description: PGP signature
