View Single Post
Old May 15, 2011, 00:45   #12
Magnate
Angband Devteam member
 
Join Date: May 2007
Location: London, UK
Posts: 5,057
Magnate is on a distinguished road
Send a message via MSN to Magnate Send a message via Yahoo to Magnate
Quote:
Originally Posted by Tobias View Post
I meant, the online fork on github. How do I rebase this to a newer main version?
1. Clone your fork locally using "git clone http://github.com/yourID/angband". You now have a local repo which tracks your fork as a remote called "origin".

2. Add the official repo as a remote with "git remote add official http://github.com/angband/angband".

3. Update your local tracking of the official repo with "git fetch official".

4. Merge the latest official changes into your local repo with "git merge official/master".

5. Push those changes up to your github repo with "git push origin master".

This assumes you have not strayed from your master branch in your local repo during this whole exercise.
Magnate is offline   Reply With Quote