Branching Guide

CUTIP Desktop follows the same triple-branch model as the core CUTIP library.

Branch Hierarchy

integration (protected — stable trunk, GitHub Pages deploy)
    ├── staging (protected — integration gate)
    │   ├── feat/cap{N}-*   (feature branches, deleted after merge)
    │   ├── bug/cap{N}-*    (bug fix branches, deleted after merge)
    │   ├── docs/cap{N}-*   (auto-generated doc updates)
    │   ├── gh/*            (GitHub workflow changes)
    │   └── claude/*        (.claude/ directory changes)
    │
    └── release/v{X.Y.Z}   (release branches, trigger release.yml)

Workflow

1. Branch from staging
2. Implement and test
3. PR to staging with CI checks
4. Merge to staging
5. Forward staging → integration
6. Auto-prune merged branches

Capability IDs

Desktop capabilities start at cap030 (cutip-core uses cap001–cap029).

• Format: cap030, cap031, ...
• Every feature/bug gets a unique cap ID
• Used in branch names, commit messages, and PR titles

Commit Format

[cap{N}] short imperative description

PR Title Format

[cap{N}] Description of capability