gitflow1.md

GIT WORKFLOW ONE: When you are ready to push your commits

1. Make sure all changed files are committed on feature-branch
2. Rebase on your feature-branch => git pull --rebase upstream master
3. Switch to your master branch => git checkout master
4. Rebase on your master => git pull --rebase upstream master
5. If there are changes then push changes to master => git push origin master
6. Go back to feature-branch => git checkout feature-branch
7. Push changes from feature-branch to github => git push origin feature-branch
8. Submit pull-request on github
   

To update your origin master on github after your pr was accepted:

9. After pull-request is accepted, delete feature-branch from Github to clean up github history
10. On command-line switch back to master branch => git checkout master
11. Rebase from master branch => git pull --rebase upstream master
12. Push changes to your master => git push origin master
13. Delete feature-branch => git branch -d feature-branch
14. Create new branch => git checkout -b new-feature

GIT WORKFLOW TWO: 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!