d-kang/gitflow2.md

Last active October 3, 2017 02:19

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/d-kang/8734e5ae521ac14f8cd10fdc40d2d074.js"></script>
Save d-kang/8734e5ae521ac14f8cd10fdc40d2d074 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

gitflow2.md

If a somones PR has been merged on github and you want to rebase:

You would currently be working on your feature-branch. Do a git branch to check
Do a git status and commit any of your unstaged changes
Rebase from feature-branch => git pull --rebase upstream master
Switch to master branch and rebase => git pull --rebase upstream master
Push updated changes up to github origin-master => git push origin master
Move Back to feature-branch => git checkout feature-branch
That’s it!

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