p/bucket
Feature flagging that's purpose-built for B2B
flo merian

Trunk-Based Development vs GitFlow — What's your dev workflow?

Featured
4
In software engineering, trunk-based development (TBD) is a strategy to manage git workflows that favours merging commits into the `main` branch even before the feature is fully complete, instead of the git flow that favours working on long-lived branches until features are 100% complete. TBD or GitFlow: What's your current developer workflow?
Replies
Best
steve beyatte
I've only really been exposed to GitFlow. Does trunk-based development create a ton of overhead with code review? Seems like there'd be a lot of reliance on CI/CD tools and test coverage and team communication. Can distributed teams really move faster like this?
Ron Cohen
@steveb if you have smaller commits/pull-requests which trunk-based development favors, you can argue you’ll have more, but smaller reviews. I think that’s a good thing though. Big PR = LGTM while a smaller PR often has more detailed comments. I don’t think I can see how there needs to be more team communication with TBD?
Ron Cohen
At Bucket, we do something closer to trunk-based development. By the way, I think a common misconception is that you cannot have branches or you cannot have PR reviews with TBD. But you totally can have both!
Hassan Sajjad
I mix both TBD for daily work, GitFlow for major releases. Curious how others handle it.