Skip to content

Instantly share code, notes, and snippets.

@shyamkkhadka

shyamkkhadka/pull

Created September 23, 2010 04:29
Show Gist options
  • Save shyamkkhadka/593105 to your computer and use it in GitHub Desktop.
Save shyamkkhadka/593105 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
pull
git checkout master
git merge branchname
git pull --rebase
(If conflict, resolve conflict:
git add .
git rebase --continue
)
git push
git checkout branchname
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment