On Thu, 25 Nov 2010, thorsten.i.r...@jyu.fi wrote: > I did (naively perhaps) change some files inside fgdata, and indeed > > git status > > gave a list of precisely those files as out of sync - which didn't really > worry me. But evidence suggests that in fact a lot more was not updated > for whatever reason. > > So what did I do wrong, and what should I do differently in the future?
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.) So commit your local changes to your local branch, then you can synchronize with upstream using git pull master-fgdata master or 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. I also recommend creating a named remote for the master repository. git remote add master-fgdata git://gitorious.org/fg/fgdata.git (You could name it origin to cut the ties to the bundle and make the repository behave more normal.) 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
