docs(workflow): implement branch protection and workflow documentation

Changes:
- Created documentation/WORKFLOW.md (comprehensive workflow guide)
  - Daily development workflow (feature → dev → main)
  - Branch naming conventions and examples
  - PR creation and review process
  - Common scenarios (new agent, bug fix, hotfix)
  - Quality checks and best practices
  - Emergency procedures

- Updated CLAUDE.md Git Workflow section
  - Document branch protection on main (PR required)
  - Add quick start workflow guide
  - Reference new WORKFLOW.md document
  - Update sprint status to complete

- Set up GitHub branch protection on main branch
  - Required PR approval (1 reviewer)
  - Dismiss stale reviews
  - Require conversation resolution
  - Enforce for admins
  - Block force pushes and deletions

- Synced dev branch with main (merged 18 commits)

Resolves violation of pushing directly to main (18 commits).
Going forward: All changes via feature branches → dev → main (PR only).

Issue: Process improvement post-sprint-11-05-2025
This commit is contained in:
Reza Rezvani
2025-11-05 16:41:29 +01:00
parent bb19152228
commit f4a9cde448
2 changed files with 565 additions and 14 deletions

View File

@@ -63,26 +63,40 @@ skill-name/
## Git Workflow
Follow conventional commits and semantic versioning:
**Branch Strategy:** feature → dev → main (PR only)
**Branch Protection Active:** Main branch requires PR approval. Direct pushes blocked.
### Quick Start
```bash
# Feature branches by domain
git checkout -b feature/marketing/seo-optimizer
git checkout -b feature/agents/content-creator
# 1. Always start from dev
git checkout dev
git pull origin dev
# Conventional commit format
feat(agents): implement cs-content-creator agent
fix(seo-optimizer): correct keyword density calculation
docs(README): update agent catalog section
# 2. Create feature branch
git checkout -b feature/agents-{name}
# Semantic versioning by skill
git tag v1.0-content-creator
git tag v1.0-product-manager-toolkit
# 3. Work and commit (conventional commits)
feat(agents): implement cs-{agent-name}
fix(tool): correct calculation logic
docs(workflow): update branch strategy
# 4. Push and create PR to dev
git push origin feature/agents-{name}
gh pr create --base dev --head feature/agents-{name}
# 5. After approval, PR merges to dev
# 6. Periodically, dev merges to main via PR
```
**Branch Strategy**: Domain-based branches, squash merge to main, semantic tags per skill release.
**Branch Protection Rules:**
- ✅ Main: Requires PR approval, no direct push
- ✅ Dev: Unprotected, but PRs recommended
- ✅ All: Conventional commits enforced
See [standards/git/git-workflow-standards.md](standards/git/git-workflow-standards.md) for complete workflow details.
See [documentation/WORKFLOW.md](documentation/WORKFLOW.md) for complete workflow guide.
See [standards/git/git-workflow-standards.md](standards/git/git-workflow-standards.md) for commit standards.
## Development Environment
@@ -103,7 +117,13 @@ See [standards/git/git-workflow-standards.md](standards/git/git-workflow-standar
**Active Sprint:** sprint-11-05-2025 (Nov 5-19, 2025)
**Goal:** Skill-Agent Integration Phase 1-2
**Status:** Day 1 complete (foundation), Day 2 ready (marketing agents)
**Status:** ✅ COMPLETE - All 6 days finished, 5 agents deployed
**Deliverables:**
- 5 production agents: cs-content-creator, cs-demand-gen-specialist, cs-ceo-advisor, cs-cto-advisor, cs-product-manager
- 1 agent template for future development
- Modular documentation structure (main + 9 domain CLAUDE.md files)
- Branch protection and workflow documentation
**Progress Tracking:**
- [Sprint Plan](documentation/delivery/sprint-11-05-2025/plan.md) - Day-by-day execution plan