Friday, November 8, 2013

Some notes about Github flow and code review

GitHub Flow: a simplified and useful approach
  • Anything in the master branch is deployable
  • To work on something new, create a descriptively named branch off of master (ie: new-oauth2-scopes)
    git checkout -b Mod0      # -b : create branch locally
                ----\    
                   branch name
    
  • Commit to that branch locally and regularly push your work to the same named branch on the server
    git push origin Mod0
    
  • When you need feedback or help, or you think the branch is ready for merging, open a pull request.
    • from my own module branch to my own master branch )
    • ask for code review from others
    • finally, merge to the master branch
  • After someone else has reviewed and signed off on the feature, you can merge it into master
    • so after this step, we can check out the branch again from Github to the local master.
    git pull origin master
    • do development again.
  • Once it is merged and pushed to ‘master’, you can and should deploy immediately.
    git push heroku master

No comments:

Post a Comment