Git Branching Strategy
A workflow defining how teams use Git branches to organize development and releases.
Also: GitFlow · GitHub Flow · trunk-based development
Definition
A Git branching strategy is a convention for how teams use branches to organize collaborative development, manage releases, and integrate changes. Common strategies include GitFlow (long-lived main, develop, feature, release, and hotfix branches), GitHub Flow (short-lived feature branches merged directly to main), and trunk-based development (all developers commit frequently to main with feature flags). Strategy choice affects team collaboration, deployment frequency, and merge conflict frequency.
Example
“The team adopted GitHub Flow: developers create short-lived feature branches from main, open pull requests for code review, and merge to main upon approval, triggering immediate deployment to production via CI/CD.”
Synonyms
- branching model
- Git workflow
- branching strategy
- Git flow
Antonyms / Opposites
- trunk-based development
- no branching
Images
CC-licensed · free to useVideo
Related Terms
- git
- cicd
- feature-flag
- agile