Orbit · Explore

Programming · by Luciana Vargas · 2026-10-16

Git workflows: trunk-based or long-lived branches?

We moved to trunk-based with feature flags and merge conflicts basically vanished. Releases need more discipline though.

63 sparks · 14 comments

Comments

Midnight Coder · 12 likes

cost vs benefit matters here, we ran numbers on trunk-based development and the payoff came later than expected

Camille Dubois · 6 likes

we saw the opposite honestly

Valentina Ruiz · 11 likes

Is anyone else tired of the hype around trunk-based development, feels like every other post is about it :)

Silver Coder · 7 likes

I'm more of an enthusiast than a pro but trunk-based development has been fun to tinker with on weekends

Rizky Pratama · 4 likes

My manager read one article on trunk-based development and now it's our whole roadmap lol

Noah Miller · 14 likes

my wallet felt that

Lucas Dubois · 0 likes

lol my cat has stronger opinions on it than I do

Mia Bauer · 0 likes

The beginner friendly path for trunk-based development is way better than a year ago, that part is underrated.

Solar Lantern · 14 likes

lol my cat has stronger opinions on it than I do

Aisha Jacobs · 0 likes

We tried trunk-based development last quarter, worked great for small stuff, got messy at scale

Curious Runner · 2 likes

send help

Marco Conti · 0 likes

Short version: trunk-based development is one of those things that sounds simple until you try it with real constraints.

João Pereira · 8 likes

wait until you see the invoice

Tanvir Rahman · 3 likes

my wallet felt that