Skip to content

Instantly share code, notes, and snippets.

@Maartenvm

Maartenvm/update_fork_storyteller

Created January 25, 2018 12:27
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Maartenvm/4b79c11af1be25d7186ca5185bd4e53a to your computer and use it in GitHub Desktop.
Save Maartenvm/4b79c11af1be25d7186ca5185bd4e53a to your computer and use it in GitHub Desktop.
Download ZIP
Update fork of Storyteller from CLTL/Storyteller
Raw
update_fork_storyteller
// go to the directory with the clone of NLeSC-Storyteller/StoryTeller
cd fork/Storyteller
// update to the current version (to make sure we are correctly configured).
git pull
// Check if the upstream is defined
git remote -v
origin git@github.com:NLeSC-Storyteller/StoryTeller.git (fetch)
origin git@github.com:NLeSC-Storyteller/StoryTeller.git (push)
upstream git@github.com:cltl/StoryTeller.git (fetch)
upstream git@github.com:cltl/StoryTeller.git (push)
// If not, add it
git remote add upstream git@github.com:cltl/StoryTeller.git
// Pull upstream
git pull upstream master
// Fix merge issues (probably none).
// Push the updated fork fork.
git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment