Hello, > JCH> - If MB is either BASE or H1, then you have a fast forward. > JCH> Take either BASE or H1 that is not MB and update variable > JCH> BASE with it, and update variable T with the tree > JCH> associated with it. Continue with the loop (i.e. Perl > JCH> "next"). > Chuck this part please. I was not thinking. No, I don't because I think this exactly what I have to do here. And yes, there can be fast forwards. :-) But note: On a fast forward condition we have to remove a element from COMMIT_HEADS: the (last) or (last - 1). Depending on if 'local' == MERGE_BASE or 'remote' == MERGE_BASE. Thomas - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon May 30 11:33:43 2005
This archive was generated by hypermail 2.1.8 : 2005-05-30 11:33:44 EST