Skip to content

Instantly share code, notes, and snippets.

@austinthecoder

austinthecoder/gist:c947818e74315c758524

Last active August 29, 2015 14:11
Show Gist options
  • Save austinthecoder/c947818e74315c758524 to your computer and use it in GitHub Desktop.
Save austinthecoder/c947818e74315c758524 to your computer and use it in GitHub Desktop.
Download ZIP
Git Workflow
Raw
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment