Git Flow vs Feature Branches

The main benefit of git-flow is when you want an extra level before you push to production. You have a branch that you can be sure has a number of features integrated and do good testing on it.

Another situation that comes up is when you need to quickly make a small change to production (master). The git-flow hot-fix concept works great for that.

@geoffevason, I’d be interested to see if you think the changes that I’ve suggested would have avoided the problem you just saw. These steps boil down to:

  1. Moving to the git-flow-avh brew formula
  2. Using my updated scripts