On Thu, 25 Nov 2010, Anders Gidenstam wrote: > git will not merge anything into your local branch when it > contains uncommitted changes. git pull ought to have complained about > that. (And it sure does here.)
Or not. sigh. It was too long since I used git pull. It does indeed merge despite local changes. Still I strongly recommend rebasing to collect your local changes at the end, which for committers would also tend to keep the main history neatly linear. > git fetch master-fgdata > git rebase remotes/master-fgdata/master > > I prefer the latter as that keeps my local changes last in the commit > graph. Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ ------------------------------------------------------------------------------ Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! Tap into the largest installed PC base & get more eyes on your game by optimizing for Intel(R) Graphics Technology. Get started today with the Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. http://p.sf.net/sfu/intelisp-dev2dev _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
