re: why branching on git is wrong VIEW POST


Agree on feature toggling, but feature branches still make sense, and yes you have to update your feature branch with trunk code at least once daily, preferably more often.

The feature branch can live a short life, maybe just to get the toggle in and then you commit to trunk. Then start a new feature Branch to do some more work behind the toggle, commit it, merge it. I view feature branching as small pieces that get checked in often. And it is up to the feature Branch devs to merge trunk in first.

Code of Conduct Report abuse