Trunk-Based Development

Definitions

1. A branching strategy where developers commit directly to the main branch (trunk) or use very short-lived feature branches (< 1 day). Relies on feature flags, comprehensive CI, and small incremental changes. Reduces merge conflicts and enables continuous deployment.

   In plain English: A way of working where everyone commits code to the main branch frequently instead of working on long-lived branches.

   Example: "We practice trunk-based development — every commit to main goes through CI and deploys to production within 15 minutes."

Related Terms

• Tag
• Feature Branch
• Git Stash
• Git Rebase
• Semantic Commit
• Rebase
• Submodule
• Commit Squashing
• Git Flow Debate
• Branch Strategy
• GitHub Flow
• GitLab Flow