Description Bernard Leach 2011-02-10 19:41:48 EST

I have a local 'topic' branch that I've used to merge in an update to my parent's parent.  Since creating the topic branch my parent has a number of commits which I'd like to merge.


A-B-C-D
 \  \ 
  J-I-E-F-G
       \
        H

Where H is actually a merge of E & D (not sure how to represent that in ascii art!).

Then I try to merge G into H and it it fails;

Merge of revisions 107976c5d8d536ddf82ecde62be1d4af36fecbe4, 0f256f58130e0891221fbbfb6882e273b951b6b1 with base 995087d9492d5a040ead7a0859f1f9c4aa25f92a using strategy resolve resulted in: Failed.

Whats odd is;

git show 107976c5d8d536ddf82ecde62be1d4af36fecbe4
fatal: bad object 107976c5d8d536ddf82ecde62be1d4af36fecbe4

git show 0f256f58130e0891221fbbfb6882e273b951b6b1 resolves to G as expected

git show 995087d9492d5a040ead7a0859f1f9c4aa25f92a resolves to a commit before A.

If I reverse the order of the merge, e.g. merge H into G it works as expected.