News for hackers. Stuff that matters.

A comment on Trunk-Based Development: Game Changers. Parent comment

Re:Trunk-Based Development: Game Changers by dezgeg on Friday February 10, 2023 @08:30AM (#34739370)
Maybe I misunderstood your description, but does 'develop' not ever merge to 'main' directly? Your description sounded like QA could for example test 'develop' which is main + featureA + featureB, give that a green light, and then have new main be main + featureA (which has been never tested). That does sound bit dangerous.

(As an embedded developer, it would be bliss to experience 'develop gets deployed semi-hourly'...)

[ Parent | on HN ]
Re:Trunk-Based Development: Game Changers by morsch on Friday February 10, 2023 @09:03AM (#34739670)
No, develop never gets merged to main. In fact, I've been meaning to add a dummy commit to develop and a commit hook that declines it being merged to main, to ensure nobody merges it by accident. One of these days...

You've identified what I'd call the main weakness, but in practice it hasn't been an issue. I've discussed it in a bit more detail in a sibling post. Ymmv.

[ Parent | on HN ]