DEV Community

Discussion on: The Problem with Feature Branches

Collapse
 
katafrakt profile image
Paweł Świątkowski

While I understand the benefits of trunk-based development, I'm still waiting for someone to explain how it's supposed to work in larger organizations. And how code review should look like.

Also, regarding the argument about continuous integration - you are supposed to rebase main branch often, so you are actually continuously integrating changes into a feature branch. And as such, it can be considered as short-living.

Collapse
 
bentorvo profile image
Ben Brazier

Trunk based development works in large organizations by splitting teams code bases by the services they manage and allowing teams to manage their own code review. There isn't a huge difference between a tiny organization and a single team within a a well structured large organisation.

I wouldn't recommend rebasing as it modifies history to be inaccurate, merging is generally a better approach. If you are continuously integrating enough that is always consistent then there is no point having separate branches.