On Friday 17 February 2006 20:21, John W. Linville wrote:
> On Fri, Feb 17, 2006 at 08:04:03PM +0100, Jiri Benc wrote:
> > On Fri, 17 Feb 2006 13:56:39 -0500, John W. Linville wrote:
> > > I have recreated my tree based off Linus' current (as of last night)
> > > tree.  At least this afforded me the opportunity to do a little
> > > more clean-up...
> > > 
> > > For those following wireless-2.6, this means you will have to manually
> > > rebase once more.  I try to avoid this, but it seems to be happening
> > > a lot lately.  Hopefully things will settle soon.
> > 
> > It seems you have re-comitted everything. I'm worried this means you
> > won't be able to pull from other trees (like mine or Michael Buesch's
> > one). Or am I wrong and git can handle this?
> 
> I was going to send a message about this, but you beat me to it...
> 
> I am hoping to persuade you, Michael, Johannes, and anyone else with
> a tree I don't know about to rebase your trees off my current tree
> so that I can continue to pull cleanly. :-)

Yep, I was going to re-clone your repos, anyway. :)
Stefano, that also means for you, that you will have to re-clone
my repos and resync your local changes again. I will tell you about it,
when I am done. In the meantime, don't push to my repository, please.

-- 
Greetings Michael.

Attachment: pgpKTRKEvGMOi.pgp
Description: PGP signature

Reply via email to