News for hackers. Stuff that matters.

A comment on This is how I git. Parent comment

Re:This is how I git by berbc on Tuesday November 10, 2020 @06:37AM (#25044827)
As said in one of the YouTube comments for the video you linked here, it's not so much feature branches that are the problem, but long-lived feature branches.

If you want to add a complex feature to a project, you could do it via several branches, one after the other. For instance, the first branch could introduce a feature flag and the second branch implement part of the new feature, and so on.

[ Parent | on HN ]
Re:This is how I git by cjfd on Tuesday November 10, 2020 @07:29AM (#25045209)
This is more of a semantic quibble than anything else. Yes, long-lived branches are not just a problem but absolutely terrible. I have seen one that lived for some 4 years or so. They are a problem to the extend that they live long. The shorter they live the less of a problem they are. So, take this to its conclusion and conclude that the best feature branch is one that is only one small commit long. And now the feature branch is completely redundant....
[ Parent | on HN ]