Git Workflow

Remotes


bitbucket   : Bitbucket, central repo, authoritative source
development : Heroku, development deployment
staging     : Heroku, staging deployment
production  : Heroku, production deployment

wkdev       : Azure, development workers
wkstaging   : Azure, staging workers
wkprod      : Azure, production workers

Committing

  • do all work on feature/bugfix branch
  • commit regularly
  • <when done>
  • checkout to developer
    $ git pull --ff-only bitbucket developer:developer
  • merge feature branch
  • <test?>
  • push





"dev is blocked!"






Bugfix 

Classification




CRITICAL
SEVERE
MINOR
WONTFIX

Pushing

 $ git push bitbucket developer:developer
 $ git push wkdev developer:master
 $ git push dev developer:master
 $ git push bitbucket developer:developer && git push wkdev developer:master && git push dev developer:master

Made with Slides.com