On Tue, Apr 19, 2005 at 01:09:42AM +0200, Petr Baudis wrote:
> > Essentially, with BK, at 7am localtime each morning, I'd:
> > - update my baseline linux 2.6 tree
> > - for each working tree which may be pulled from
> > - if the baseline is a superset
> > - update working tree from baseline
> > The net result is that my workflow consisted entirely of:
> > 1. commit whatever into working tree
> > 2. test
> > 3. send linus a pull request
> > 4. repeat next day
> > The tree resynchronisation happened completely and entirely in the
> > background with no user intervention required at all.
> And in the case of conflicts...?
If the baseline is a superset of the working tree, there will never be
any conflicts. Note that as I said above, this is a condition on doing
the pull in the first place.
How we determine that with git is another matter though. 8)
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html