Hey everyone, I'm looking for advice on scaling Git workflows for a team of 50+ developers. What branching strategies work best to keep things manageable?
Hey everyone, I'm looking for advice on scaling Git workflows for a team of 50+ developers. What branching strategies work best to keep things manageable?
We use a Gitflow style with develop as the integration branch and release branches for milestone builds. Feature branches are short‑lived, and we enforce PR reviews.
Also, a pre‑commit hook to run linting and tests helps catch issues early.
We moved to a trunk‑based approach after hitting a bottleneck with long‑lived feature branches. The idea is to keep the main branch releasable at all times and use feature flags.
It reduced merge conflicts dramatically.