Skip to content

Instantly share code, notes, and snippets.

@lsm

lsm/gist:69f777d9ec0d347d2855

Created January 29, 2015 00:23
Show Gist options
  • Save lsm/69f777d9ec0d347d2855 to your computer and use it in GitHub Desktop.
Save lsm/69f777d9ec0d347d2855 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Step 1: From your project repository, bring in the changes and test.
git fetch origin
git checkout -b anton-redesign origin/anton-redesign
git merge master
Step 2: Merge the changes and update on GitHub.
git checkout master
git merge --no-ff anton-redesign
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment