On Thu, Aug 26, 2010 at 2:39 PM, Elijah Newren <newren@xxxxxxxxx> wrote: > On Wed, Aug 25, 2010 at 9:52 PM, Nguyen Thai Ngoc Duy <pclouds@xxxxxxxxx> wrote: >> Let's say in "ancestor" tree, we have >> >> t1/f0 >> t2/t3/f0 >> >> In "you" tree, we have >> >> t1/f0 >> t2/t3/f0 >> t2/t3/f1 >> >> In "upstream" tree, we have >> >> t1/f0 >> t2/t3/f0 >> t2/t3/f2 >> >> The narrow tree is t1, so we the trees we have are toplevel tree and > > How would you get the "you" tree? Since you don't have the data for > t2 or t2/t3, there's no way you can create and commit this tree. "you" tree does not create that file. It's been there. It's the "ancestor" tree that did not have that file. So if you happen to choose an "upstream" tree that git-merge-base would give you that particular "ancestor" tree, we're in this situation. -- Duy -- 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