this post was submitted on 15 May 2024
89 points (95.9% liked)

Programming

17453 readers
97 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev



founded 1 year ago
MODERATORS
 

I've heard it thrown around in professional circles and how everybody's doing it wrong, so.. who actually does use it?

For smaller teams

"scaled" trunk based development

you are viewing a single comment's thread
view the rest of the comments
[–] 0x0@programming.dev 6 points 6 months ago

Team of one here tends to work on master only for very small stuff.

There's a branch for the next release which will get merged once everything's done. Occasionally there are smaller branches that fork off of the release branch and get merged back.

Meanwhile master is, most of the time, an old copy of the new release branch so merging goes without issue. Unless there's a problem in prod, then it gets fixed in master and backported to the feature branch.

I should use feature toggles more (usually #ifdef, sometimes if (config_Flag)), occasionally a big feature creeps in and i know management will change it at least 3 times and 2-3 new releases will come out in between...