Updating Slate - shippify/slate GitHub Wiki
Add the remote, call it upstream
:
git remote add upstream [email protected]:tripit/slate.git
Fetch all the branches of that remote into remote-tracking branches, such as upstream/master
:
git fetch upstream
Make sure that you're on your master branch:
git checkout master
Merge your our updates into your master branch:
git merge upstream/master
Push the updated code to Github:
git push
Publish the new changes to Github pages:
rake publish
(Thanks to Mark Longair on StackOverflow for the upsteam explanation.)