TR
Trunk-Based Development
Small, frequent commits directly to main or short-lived feature branches
Details
Language / Topic
_UUniversal
Category
Git Workflow
Rules
balanced
Trunk-Based Development
- Merge code to the main branch continuously, multiple times a day.
- Keep feature branches short-lived (less than 1-2 days). Never maintain long-running integration branches.
Trunk-Based Development
- Practice Trunk-Based Development: commit directly to main or utilize extremely short-lived feature branches that merge back to main within 24-48 hours.
- Deal with incomplete features in production using Feature Flags (Toggles), rather than delaying integration until a feature is completely finished.
- Synchronize your local main branch frequently (pull/rebase) to minimize complex merge conflicts.