<i>What we are doing git-wise is the reverse of what the article shows: Bug-fixes are (usually) done on the release-branches, while all feature development (except of these customizations) is done on the main branch (we just use the git default name "master").</i><p>I would just like to point out to git newbies that there is nothing special about the master branch in git except that it is a reasonable default. In terms of working on the release branch or working on master, there are no extra features or support from git, so the trade-off is only in what is easier for you and your team to remember.