1.7 KiB
1.7 KiB
GitFlow Workflow Notes
This document is the operational reference for branch and release flow in HoopScout.
Branch Types
main: productiondevelop: integrationfeature/*: new work fromdeveloprelease/*: release preparation fromdevelophotfix/*: urgent production fixes frommain
Branch Start Commands
Create develop from current main:
git checkout main
git pull origin main
git checkout -b develop
git push -u origin develop
Create feature/*:
git checkout develop
git pull origin develop
git checkout -b feature/<scope>-<short-description>
Create release/*:
git checkout develop
git pull origin develop
git checkout -b release/<major>.<minor>.<patch>
Create hotfix/*:
git checkout main
git pull origin main
git checkout -b hotfix/<scope>-<short-description>
Release Flow
- Branch
release/x.y.zfromdevelop. - Freeze feature work on release branch (only bugfix/docs/changelog).
- Validate in Docker and test suite.
- Merge release branch into
main. - Tag
vX.Y.Zonmain. - Merge release branch back into
develop.
Hotfix Flow
- Branch
hotfix/*frommain. - Apply minimum safe fix and tests.
- Merge hotfix into
main. - Tag patch release (
vX.Y.Z). - Merge hotfix into
develop.
Milestone-Oriented Branching Recommendation
Recommended sequence for planning feature branches:
- Domain and indexing stability
- Search/filter performance
- Scouting UX workflows
- Provider adapter breadth
- Ingestion observability
- API hardening
- Security and rate-limit tuning
Keep milestones in issues/boards; use branches only for implementation slices.