GitFlow was designed for teams shipping scheduled releases. If you're deploying continuously, it's overkill.
Everyone works off main. Short-lived feature branches (1-2 days max), merged via PR.
Rules:
feat: add tag filtering to blogs list
fix: prevent duplicate likes from same user
refactor: extract tag sync logic to service layer
Conventional commits + a good CI pipeline = a changelog you didn't have to write manually.
Never commit directly to main. Everything else is negotiable.
Trunk-based dev is the way. The moment a team adopts it, the merge conflict drama disappears.
Log in to leave a comment.