Hi, On Thu, 7 Dec 2006, Shawn Pearce wrote: > So I managed to create a fairly complex set of branches which are all > merged back against each other at various points in time. Two of > them have 3 merge bases according to git-merge-base. Tonight I > tried to merge them together, but received the following wonderful > error from git-merge-recursive: > > fatal: unable to read source tree (4b825dc642cb6eb9a060e54bf8d69288fbee4904) > > For those in the know, that's the empty tree. This particular > repository does not have the empty tree anywhere in it, which is why we > can't read the object: it doesn't exist, and shouldn't exist. I think there is something else wrong. If you have three merge bases, I do not see how you could get into that particular code path. Any possibility for me to have a private look at your repo? Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html