"John Dlugosz" <JDlugosz@xxxxxxxxxxxxxxxx> 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 -- 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
