DEV Community

Discussion on: The Problem with Feature Branches

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.