this post was submitted on 15 May 2024
88 points (96.8% liked)

Programming

17655 readers
309 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 [email protected]



founded 2 years 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
[–] [email protected] 5 points 7 months ago (2 children)

I’ve been a fan of git-flow for a long time. It makes the master consistently stable and production ready, gives mechanisms for hotfixing, patching, releasing, tagging, and regular feature dev with a running develop branch. This tends to be more stable than Wild West commits into dev direct, since you work on a feature in isolation, and then merge the feature in when it’s ready, and keeps prod in its own lane so there’s no risk of a feature accidentally nuking something.

[–] [email protected] 1 points 7 months ago (1 children)

Doesn't the "scaled trunk-based development" do that too, with feature branches and merge requests? Trunk is your production-ready branch there.

[–] [email protected] 1 points 7 months ago

Yeah they’re similar in several ways

[–] [email protected] 1 points 7 months ago

I'm another git-flow fan. Have not encountered a situation that would motivate me to change workflow. We use submodules all over the place, too.