On 06/09/2011 11:06 AM, Michael Haggerty wrote: > On 06/06/2011 08:16 AM, Junio C Hamano wrote: >> Scott Chacon<schacon@xxxxxxxxx> writes: >>> For example, implementation details aside, I think having something >>> like WTREE and NEXT available would help users understand that there >>> are these 3 trees that are important and useful in Git and re-inforce >>> a very non-SVN style workflow in that manner. >> >> That's a funny thing to say. Working tree may almost always (to put it >> another way, "you could make it to") act like a tree, but the index does >> not act like a tree at all in more important situations. > > My naive understanding is that in the case of a merge commit, the index > contains information equivalent to *multiple* trees: > > NEXT -- HEAD plus the files that have been resolved > BASE -- the contents of the common ancestor > OURS -- equivalent to the tree from HEAD > THEIRS -- equivalent to the tree from MERGE_HEAD > Except there might be any number of THEIRS in the case of an octopus merge. The most common case is just one though. -- Andreas Ericsson andreas.ericsson@xxxxxx OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 Considering the successes of the wars on alcohol, poverty, drugs and terror, I think we should give some serious thought to declaring war on peace. -- 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