Skip to content

Instantly share code, notes, and snippets.

@atainton

atainton/merging-pull-requests-using-the-command-line.txt

Forked from jamieandyou/merging-pull-requests-using-the-command-line.txt
Last active May 17, 2017 09:15
Show Gist options
  • Save atainton/c3c02e9a7310675ad4efdf855ab3821a to your computer and use it in GitHub Desktop.
Save atainton/c3c02e9a7310675ad4efdf855ab3821a to your computer and use it in GitHub Desktop.
Download ZIP
Merging pull requests using the command line
Raw
merging-pull-requests-using-the-command-line.txt
credit to https://github.com/mdkrog
git checkout development
git pull origin development
git checkout your-local-branch
git rebase -i development
git push -f origin your-local-branch
git checkout development
git merge your-local-branch --ff-only
git push origin development
git push origin --delete <branch_name> -> delete remote branch
git branch -d <branch_name> -> to delete local branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment