Created
January 25, 2018 12:27
-
-
Save Maartenvm/4b79c11af1be25d7186ca5185bd4e53a to your computer and use it in GitHub Desktop.
Update fork of Storyteller from CLTL/Storyteller
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
// 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 [email protected]:NLeSC-Storyteller/StoryTeller.git (fetch) | |
origin [email protected]:NLeSC-Storyteller/StoryTeller.git (push) | |
upstream [email protected]:cltl/StoryTeller.git (fetch) | |
upstream [email protected]:cltl/StoryTeller.git (push) | |
// If not, add it | |
git remote add upstream [email protected]: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