Git Workflow

gistfile1.md

Workflow

if needs approval
  if requires immediate release
    - work on <feature> (branched from master)
    when approved
      - rebase master to <feature>, merge <feature> to master
      - merge master to develop
  else
    - work on <feature> (branched from develop)
    - when approved, rebase develop to <feature>, merge <feature> to develop
if requires immediate release
  - work on master
  - merge master to develop
else
  - work on develop

Notes

• "merge A to B" means git checkout B followed by git merge A
• "rebase A to B" means git checkout B followed by git rebase A