Dev Practices

Trunk-based development vs feature branches: which one to choose?

Monday, you create a branch for your new feature. Friday, you try to merge. The conflict is 400 lines long. You spend the afternoon untangling what your colleagues did while you were working in isolation. This scenario has a name: merge hell. And it has an identifiable cause.