Skip to content

Instantly share code, notes, and snippets.

@d-kang

d-kang/gitflow2.md

Last active October 3, 2017 02:19
Show Gist options
  • Save d-kang/8734e5ae521ac14f8cd10fdc40d2d074 to your computer and use it in GitHub Desktop.
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:

  1. You would currently be working on your feature-branch. Do a git branch to check
  2. Do a git status and commit any of your unstaged changes
  3. Rebase from feature-branch => git pull --rebase upstream master
  4. Switch to master branch and rebase => git pull --rebase upstream master
  5. Push updated changes up to github origin-master => git push origin master
  6. Move Back to feature-branch => git checkout feature-branch
  7. That’s it!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment