Short-lived feature branches

Author:Andrey Aleksandrov

This article was translated by AI. All my articles were originally published in russian, but I decided to make them more accessible for the rest of the world.

Usually I mention short-lived feature branches in the context of Continuous Integration because without such a practice, no CI will work for you in principle, but they are encountered not only there.

If you have decided to go with Trunk Based Development, the first thing you will encounter is the transition to short-lived branches. Moreover, the trunk imposes additional restrictions on such branches:

  • it is impossible to merge a branch into other people’s branches
  • it is impossible to merge into release and other long-lived branches
  • only master can be merged into the branch itself
  • the branch is merged only after everything is done in it and after the merge, it is no longer needed

In other words, you create a branch, work in it for about a day, and merge it into master. The trunk assumes that you cannot deviate from this scheme, except by committing directly to master.

TDB Short-Lived Feature Branches

I consult about what I write about, you can contact me via telegram @aladmit or by mail [email protected].

Subscribe to not miss new articles