GIT-007 critical branch-strategy
Feature branches for all work
All development work happens in feature branches via PRs
Question to ask
"When was the last direct commit to main?"
Verification guide
Severity: Critical
Check automatically:
# Check recent commits on main - should be merge commits from staging
git log origin/main --oneline -20
# Check recent commits on staging - should be merge commits from feature branches
git log origin/staging --oneline -20
# Check for merge commits specifically
git log origin/main --oneline -20 --merges
git log origin/staging --oneline -20 --merges
Look for:
- main: merge commits from staging (not direct commits)
- staging: merge commits from feature branches (not direct commits)
- Commit messages indicate PR merges (e.g., "Merge pull request #123")
Pass criteria:
- All recent changes on main came via merges from staging
- All recent changes on staging came via merges from feature branches
- No evidence of direct pushes to either branch
Fail criteria:
- Direct commits on main or staging that aren't merges
- Evidence of bypassing PR process
Evidence to capture:
- Last 20 commits on main showing merge pattern
- Last 20 commits on staging showing merge pattern
- Any direct commits flagged with date and author