More than 1 year has passed since last update.

original github flow

  • Anything in the master branch is deployable
  • To work on something new, create a descriptively named branch off of master (ie: new-oauth2-scopes)
  • Commit to that branch locally and regularly push your work to the same named branch on the server
  • When you need feedback or help, or you think the branch is ready for merging, open a pull request
  • After someone else has reviewed and signed off on the feature, you can merge it into master
  • Once it is merged and pushed to ‘master’, you can and should deploy immediately

new github flow

  • Create a branch
  • Add commits
  • Open a Pull Request
  • Discuss and review your code
  • Deploy
  • Merge

differences between original and new

  • DeployとMergeの順番が逆になる
  • masterにmergeする前にtopic branchからデプロイする
    • 仮に問題があった場合、masterに切り替えれば済む
    • originalのflowではmasterにmergeされたものをrevertする必要がある