git-branch-strategy
Git Branch Strategy
Overview
Use this skill to design a branch model that teams can operate consistently under normal delivery and incident pressure.
Scope Boundaries
- Use this skill when the task matches the trigger condition described in
description. - Do not use this skill when the primary task falls outside this skill's domain.
Shared References
- Existing governance baseline:
references/git-governance-contract.md
- Topology decision guidance:
references/branch-topology-decision-rules.md
Templates And Assets
- Branch policy template:
assets/branch-policy-template.md
- Branch protection checklist:
assets/branch-protection-checklist.md
Inputs To Gather
- Team size, collaboration style, and review ownership model.
- Release cadence, hotfix urgency expectations, and support windows.
- Branch protection capabilities on the hosting platform.
- Current pain points (long-lived drift, merge conflicts, unclear ownership).
Deliverables
- Branch class policy with creation/deletion/merge rules.
- Protection rules mapped to branch criticality.
- PR synchronization policy by branch class.
- Operational guidance for hotfix and release scenarios.
Workflow
- Define branch classes and responsibilities in
assets/branch-policy-template.md. - Choose topology using
references/branch-topology-decision-rules.md. - Set merge direction and sync policy per branch class.
- Configure protection and verify with
assets/branch-protection-checklist.md. - Publish policy with concrete examples for common workflows.
Quality Standard
- Branch classes are minimal, non-overlapping, and enforceable.
- Protection rigor matches branch risk (stable > release > feature).
- Merge/sync strategy is clear enough to avoid per-PR ambiguity.
- Hotfix path is explicit and does not bypass traceability.
Failure Conditions
- Stop when branch classes overlap without clear operational purpose.
- Stop when policy requires controls that the hosting platform cannot enforce.
- Escalate when hotfix process conflicts with protection and compliance requirements.
More from kentoshimizu/sw-agent-skills
graph-algorithms
Graph algorithm workflow for modeling entities/relations and selecting traversal, path, ordering, or flow strategies. Use when correctness or performance depends on graph representation and algorithm choice; do not use for schema-only modeling or deployment topology planning.
14bash-style-guide
Style, review, and refactoring standards for Bash shell scripting. Trigger when `.sh` files, files with `#!/usr/bin/env bash` or `#!/bin/bash`, or CI workflow blocks with `shell: bash` are created, modified, or reviewed and Bash-specific quality controls (quoting safety, error handling, portability, readability) must be enforced. Do not use for generic POSIX `sh`, PowerShell, or language-specific application style rules. In multi-language pull requests, run together with other applicable `*-style-guide` skills.
11architecture-clean-architecture
Clean Architecture workflow for enforcing dependency direction, stable domain boundaries, and use-case-centered application design. Use when teams must separate business rules from frameworks and delivery mechanisms; do not use for isolated module cleanup without boundary implications.
11powershell-style-guide
Style, review, and refactoring standards for PowerShell scripting. Trigger when `.ps1`, `.psm1`, `.psd1` files, or CI workflow blocks with `shell: pwsh` or `shell: powershell` are created, modified, or reviewed and PowerShell-specific quality controls (error handling, parameter validation, readability, operational safety) must be enforced. Do not use for Bash, generic POSIX `sh`, or language-specific application style rules. In multi-language pull requests, run together with other applicable `*-style-guide` skills.
10github-codeowners-management
Govern CODEOWNERS rules so review routing reflects real ownership and risk boundaries on GitHub. Use when repository ownership mapping or mandatory reviewer rules must be defined, updated, or audited; do not use for non-GitHub runtime architecture or data-layer design.
9security-authentication
Security workflow for authentication architecture, credential lifecycle, and session/token assurance. Use when login, identity proofing, MFA, or session security decisions are required; do not use for authorization policy design or non-security quality tuning.
9