What’s your usual workflow when multiple people are working on multiple features in the same codebase? Some companies release multiple times a day — how would you make it happen without branches?
-
-
Replying to @meglio
You just do trunk based development instead. Merge your work into trunk multiple times per day (ideally behind a feature flag). You need good CI/CD and auto-testing to keep the trunk healthy and you need programmers to work in SMALL changes but it's doable (and at scale).
3 replies 0 retweets 9 likes -
Replying to @StevenBHutton
So I suppose you have got experience in this? So is it alright to ship the next version with some other unfinished version? In your scenario, I guess the hardest thing would be to work on SMALL changes at all times. Not all developers can do it?
1 reply 0 retweets 1 like -
Replying to @meglio
Yeah, we have some experience doing this, also there're plenty of examples of large teams doing this to effect. If you have unfinished features you can disable them behind feature flags and config changes until they're ready.
2 replies 1 retweet 5 likes -
Replying to @StevenBHutton
I see. What’s the benefit of using no branches vs using them? I ask because using branches is cheap and effortless, at least that’s been my experience so far.
1 reply 0 retweets 4 likes -
Replying to @meglio
Branches aren't effortless IMO. And every programming productivity book written in the ten years agrees. Branches lead to lots of extra work and many new bugs when you come to merge them. The longer the branch lives the worse this gets.
2 replies 1 retweet 19 likes -
Replying to @StevenBHutton @meglio
If you have a release coming up you will likely have many features all being merged from various branches. You then need ANOTHER branch for release stabilisation, to merge everything to just to handle the chaos. I want to release after every commit, not after weeks of prep...
1 reply 1 retweet 6 likes -
Replying to @StevenBHutton
How well does this approach scale? Examples?
2 replies 0 retweets 0 likes -
-
Replying to @StevenBHutton
May I also ask
@cmuratori and@Jonathan_Blow if you use branching in git/svn? Why/why not?2 replies 0 retweets 2 likes
I don't use branches unless I'm using GitHub and I'm trying to push something so the public can see multiple versions of the thing using the drop-down menus, etc.
Loading seems to be taking a while.
Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.