Skuunk Works

In my current gig in ABC Active Memory ( https://activememory.com/ ) we have put together a git workflow which works really well for us, so I decided I would write about it here so that others could benefit. The things you need to have in place though are Continuous Deployment ( http://en.wikipedia.org/wiki/Continuous_delivery ), Test Driven Development ( http://en.wikipedia.org/wiki/Test-driven_development ), Agile ( http://en.wikipedia.org/wiki/Agile_software_development ) and the desire to keep releasing small independent incremental features without any one of them blocking each other. Branches So the key is branches (obviously). We have 2 main branches which are shared by everyone, and every new feature takes place in a feature branch.  Our 2 shared branches are  acceptance master Feature branch When we start a new feature, we do all the work in our feature branch which we cut from  master . Our feature branches are named by ticket number (i.e...