Back to Skills

branch-strategy-advisor

verified

Recommends git branching strategies and workflows based on team size, deployment frequency, and project requirements. Use when choosing branching models, planning workflows, or optimizing git processes.

View on GitHub

Marketplace

fastagent-marketplace

armanzeroeight/fastagent-plugins

Plugin

git-workflow-toolkit

Version Control

Repository

armanzeroeight/fastagent-plugins
20stars

plugins/git-workflow-toolkit/skills/branch-strategy-advisor/SKILL.md

Last Verified

January 21, 2026

Install Skill

Select agents to install to:

Scope:
npx add-skill https://github.com/armanzeroeight/fastagent-plugins/blob/main/plugins/git-workflow-toolkit/skills/branch-strategy-advisor/SKILL.md -a claude-code --skill branch-strategy-advisor

Installation paths:

Claude
.claude/skills/branch-strategy-advisor/
Powered by add-skill CLI

Instructions

# Branch Strategy Advisor

Recommend optimal branching strategies for your project.

## Quick Start

Choose strategy based on team and deployment:
- Small team + continuous deployment → GitHub Flow
- Large team + scheduled releases → Gitflow
- Fast iteration + feature flags → Trunk-Based Development

## Instructions

### Step 1: Assess Project Context

**Team Size**:
- Small (1-5 developers)
- Medium (6-20 developers)
- Large (20+ developers)

**Deployment Frequency**:
- Continuous (multiple times per day)
- Daily
- Weekly
- Scheduled releases (monthly/quarterly)

**Release Model**:
- Single production version
- Multiple versions in production
- Long-term support versions
- Rolling releases

**Technical Constraints**:
- Feature flags available?
- Automated testing coverage?
- CI/CD pipeline maturity?
- Code review requirements?

### Step 2: Select Branching Strategy

**GitHub Flow** - Best for:
- Small to medium teams
- Web applications
- Continuous deployment
- Simple workflow needed

**Structure**:
```
main (production)
  ├── feature/user-auth
  ├── feature/payment-integration
  └── bugfix/login-error
```

**Workflow**:
1. Create feature branch from main
2. Make changes and commit
3. Open pull request
4. Review and test
5. Merge to main
6. Deploy automatically

**Pros**: Simple, fast, continuous deployment
**Cons**: Requires good CI/CD, no release staging

---

**Gitflow** - Best for:
- Large teams
- Scheduled releases
- Multiple versions in production
- Need for hotfix support

**Structure**:
```
main (production)
develop (integration)
  ├── feature/new-dashboard
  ├── feature/api-v2
  ├── release/v2.0
  └── hotfix/critical-bug
```

**Workflow**:
1. Feature branches from develop
2. Merge features to develop
3. Create release branch from develop
4. Test and fix in release branch
5. Merge release to main and develop
6. Tag release on main
7. Hotfixes from main, merge to main and develop

**Pros**: Structured, supports multiple versions, clear release process
**Cons

Validation Details

Front Matter
Required Fields
Valid Name Format
Valid Description
Has Sections
Allowed Tools
Instruction Length:
7719 chars