The reason he is not fond of feature branches seems to be that they allow a single developer to work on a feature for too long before integrating with the maste

The reason he is not fond of feature branches seems to be that they allow a single developer to work on a feature for too long before integrating with the master branch. This only becomes apparent in the footnotes where he states that if your feature branches live for only a day, then your basically doing what he calls continuous integration. This feels more like something that can be remedied through having good practices. Just like you shouldn't go without committing for days when working with Subversion, it is probably a good idea in a DVCS to: - integrate the main branch with your feature branch often (at least daily) - don't do semantic changes in a feature branch. Instead, switch to the main branch (or a very shortlived new branch) and do the semantic change. This should avoid 2 feature branches doing semantic changes and then having a merging hell after a week or so of development.