These days, another strategy has regained a certain popularity among developers all around the world; its name says it all: stop using branches, use only the master branch!

In the picture below there's the essence of this flow:

This trend aims to fight the so called merge hell; this happens when branches diverge for too long, so merging them is a pain. Similar to the GitHub flow, here there aren't long living branches, but even feature branches are discouraged.

Continuous Integration and Continuous Delivery are under the light here, and this way of working really enforces these good practices we already know thanks to the eXtreme Programming (http://www.extremeprogramming.org/) mindset and practices.

This movement is too wide and deep to be discussed here in a couple of sentences, but it's worth reading its principles, as it makes you reflect on the topics a developer faces during his day by day work. So please take a minute and read more about it at trunkbaseddevelopment.com.