HACKER Q&A
📣 WolfOliver

Difference between trunk based development vs. short living branches?


Difference between trunk based development vs. short living branches?


  👤 PaulHoule Accepted Answer ✓
Circa 2002 I got into developing with CVS where trunk based development with release branches was the only model that wouldn't have you pulling your hair out.

https://trunkbaseddevelopment.com/branch-for-release/

For a while after that it was CVS, Visual Source Safe, or Subversion and usually it was trunk based development with a very little bit of feature branches.

More recently (post 2015 or so) it has always been Git. Projects I do on my own account are still trunk based because there's no need for anything else. For work it is always feature branches with pull requests, largely it works pretty well. Most of the feature branches I work on last less than 2 weeks, often just a few days. Once in a while there is a big one that takes a month. I find it an easy way to work.