Version Control Branching Strategy Document
Define and formalize Git workflow, branch types, and merging standards.
Project & Core Branches
Workflow Rules & Standards
Release and Hotfix Policy
Branching Strategy Policy
Base Strategy: | Generated:
I. Core Branches and Function
- Production Branch (): Represents the latest deployed production code. Only merges from Release or Hotfix branches are permitted. Tags must be applied here.
- Integration Branch (): Represents the next scheduled release's integration point. All new features and stable bug fixes must be merged here first.
II. Branch Naming & Review Standards
- Naming Convention:
- Code Review Policy: . Required before merging into the Integration Branch.
- Merging Style: We utilize the strategy to maintain a clean history.
III. Release and Hotfix Protocol
Release Process:
Hotfix Policy:
IV. Branch Types and Usage
- Feature Branches: Branch from `develop`, merge into `develop`. Used for all new feature development.
- Release Branches: Branch from `develop`, merge into `main` and back into `develop`. Used for final QA, minor bug fixes, and preparing release candidates.
- Hotfix Branches: Branch from `main`, merge into `main` and back into `develop`. Used for critical, production-breaking bugs.