git-branch-strategy

Define Git branch topology, lifecycle rules, and merge policy.

7|Updated Feb 14, 2026
One-click install
npx skills add https://github.com/KentoShimizu/sw-agent-skills --skill git-branch-strategy
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-branch-strategy
Source: https://github.com/KentoShimizu/sw-agent-skills/tree/main/skills/git-branch-strategy
Command: npx skills add https://github.com/KentoShimizu/sw-agent-skills --skill git-branch-strategy

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) and assets (resource) components.

What problem does it solve?

Defines a clear Git branching model that prevents unsafe history and merge conflicts by codifying branch governance into the team workflow.

Core Features & Use Cases

  • Branch classes (Stable, Release, Hotfix, Feature) with explicit creation, protection, and deletion rules.
  • Merge policy and sync guidance by branch class, plus a template-driven approach for consistent workflows.
  • References and templates included for quick adoption, including a policy template and a protection checklist.

Quick Start

Define the branch policy using the templates in assets and apply it to your repository.

Frequently Asked Questions about git-branch-strategy

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
What is a Git branching strategy and why do I need governance for my repository?

A Git branching strategy defines branch topology and lifecycle rules to prevent unsafe history and merge conflicts. You need explicit governance to control mainline delivery, releases, hotfixes, and collaborative workflows safely.

How do I define merge policies and branch protection rules for stable and release branches?

To define merge policies and branch protection rules, apply a template-driven approach that establishes explicit creation, protection, and deletion rules for Stable, Release, Hotfix, and Feature branch classes.

Does this Git workflow model support hotfix branches and release management for team collaboration?

Yes, this Git workflow model supports team collaboration by defining explicit branch classes for Hotfix and Release management. It includes lifecycle rules and merge policy guidance tailored for collaborative team environments.

What's the best way to enforce branch creation and deletion rules in a collaborative Git workflow?

The best way to enforce branch creation and deletion rules is codifying branch governance into your team workflow using policy templates and a protection checklist, ensuring consistent lifecycle management across all branch classes.

Can I use these Git branching templates without pre-existing branch protection controls?

Yes, you can use these Git branching templates without pre-existing controls. The included policy template and protection checklist provide the necessary governance references to establish mainline delivery and release rules from scratch.

When should I not use a strict Git branch topology for my team's mainline delivery?

You should not use a strict Git branch topology if your team does not require explicit governance for mainline delivery, releases, or hotfixes, as the model enforces heavy lifecycle rules and merge policies.