On Sun, 27 Jun 2010, Jason Cox wrote: > Thanks for that. > I have just been using a "git clone" and letting it decide on what was > the working copy. I think it used v2.0.0-r4 or something. > > All 3 were done the same, I will change them to "next".
The following instructions are for the FlightGear and SimGear soource repositories. In the fgdata repository the branch you want to track is called master. Changing to the 'next' branch for the first time would be two commands (in your clone): git branch -t -l next origin/next git checkout next Where git branch ... give you a local branch named 'next' that tracks the 'next' branch in the master repository. git checkout next switches the work directory of your local repository to your new 'next' branch. To update your local 'next' you do (assuming that that is your currenty checkedout branch - check with git branch) git pull (which fetches the latest commits from origin/next and merges them intoyour next branch); or if you have local commits that you want to keep on top of the official ones git fetch git rebase origin/next (where the first fetches the latest commits to the origin/next branch in your local repository and the second updates your next branch to be like origin/next but with your local commits on top. NOTE: Do not rebase commits that you have pushed to a public repository!) Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Flightgear-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/flightgear-devel
