Forked from jamieandyou/merging-pull-requests-using-the-command-line.txt
Created
February 10, 2016 08:18
-
-
Save ryannealmes/ed57790ca072ad7f4bcf to your computer and use it in GitHub Desktop.
Merging pull requests using the command line
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
credit to https://github.com/mdkrog | |
git checkout development | |
git pull origin development | |
git checkout you-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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment