From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Wed, 25 Feb 2009 18:44:22 GMT
Subject: Re: Files different for me
Message-ID: <vpqbpsq9x15.fsf@bauges.imag.fr>
In-Reply-To: <450196A1AAAE4B42A00A8B27A59278E709E0486D@EXCHANGE.trad.tradestation.com>

"John Dlugosz" <JDlugosz@TradeStation.com> writes:

> 	Oldstuff--A--B--C  remote
> 	       \
> 	        LC--X--Y  mine
>
> LC is "Local Changes", X and Y are changes I made, and A, B, C are
> changes from other developers.
>
> After a fetch, I have:
>
> 	Oldstuff--LC--X--Y--A'--B'--C'  mine

No, your changes get rebased:

 	Oldstuff--A--B--C--LC'--X'--Y'   mine

You should just be carrefull not to push in this state, since you'd
push LC too. But you can throw away LC later with "git rebase -i".

-- 
Matthieu