Skip to content

Instantly share code, notes, and snippets.

@SeanPlusPlus
Forked from dlbewley/gist:a062df2612fb1e4b7e5f
Last active August 29, 2015 14:16
Show Gist options
  • Save SeanPlusPlus/6f6bd45844f5956babff to your computer and use it in GitHub Desktop.
Save SeanPlusPlus/6f6bd45844f5956babff to your computer and use it in GitHub Desktop.
how to merge from upstream

How do I get changes from Sean's sweet repo?

git remote add upstream git@github.com:SeanPlusPlus/WebDevTemplates.git
git fetch upstream
git checkout master
git merge upstream/master

Beware of conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment