Good Git deployment using branches strategy with Heroku?

Question

What is a good deployment strategy to use with Git + Heroku (Ruby on Rails)?

Currently, the way I work with my origin Git repository: All features (or \'stories\') are f

Answer 1

Ever since I read Vincent Driessen's A successful Git branching model, I have been hooked. My entire company (8 of us) have now standardized on this model and a few other places I've consulted with have also started using it as well.

Most everyone I've shown it to says they were doing something similar already and found it very easy to adapt.

In a nutshell, you have 2 branches that are permanent (master and develop). Most of the time you'll just be making branches off of develop and merging them back into develop. Things get a little more complex when you get into doing production releases and hotfixes, but after reading the post a couple of times, it becomes engrained.

There's even a command line tool called git-flow to help you out.