branching-strategy-wasp-drone — Claude Code subagent
branching-strategy-wasp-drone — a subagent that guides your team through selecting a Git branching model (trunk-based development, GitHub Flow, GitFlow) and resolving merge pain, release workflows, and feature-flag trade-offs.
AGPL-3.0-or-later ★ 96 updated 2026-10-18
/plugin marketplace add legioncodeinc/vibe-coding-tools
/plugin install wasp-nest-core@wasp-nestWhat branching-strategy-wasp-drone does
branching-strategy-wasp-drone evaluates how your team structures version control: which of four canonical models fits your release cadence and product type, how to handle release and hotfix branches, whether to squash-merge or rebase feature branches, and when feature flags are a better choice than long-lived branches. It asks about release frequency, team size, and product shape — these are the strongest predictors of the right model.
By default, it recommends trunk-based development for teams with CI/CD discipline, GitHub Flow otherwise. GitFlow only surfaces if you genuinely maintain multiple versions in parallel. It diagnoses common symptoms: merge conflicts often trace back to branches older than 2 working days; unclear release processes point to undocumented hotfix protocols. The subagent hands you a branching policy document to commit to docs/engineering/branching-policy.md.
It does not touch Git mechanics (interactive rebase, conflict resolution) — that is git-wasp-drone. It does not configure branch protection rules — that belongs to github-repo-health-wasp-drone. It does not author CI/CD pipelines — that is devops-wasp-drone.
What it helps with
- choose between trunk-based development, GitHub Flow, and GitFlow
- diagnose why merge conflicts are frequent or severe
- design a release and hotfix protocol
- decide when feature flags replace feature branches
- select a merge strategy: commit, squash, or rebase
Example prompts for the agent
- We're always merging into each other's branches and resolving conflicts manually. What model should we switch to?
- Our SaaS releases twice a week. Is GitFlow overkill for us?
- When should we hide a feature behind a flag instead of branching?
How to install branching-strategy-wasp-drone
1Plugin marketplace
/plugin marketplace add legioncodeinc/vibe-coding-tools/plugin install wasp-nest-core@wasp-nest2Manually: put the files in place
.claude/agents/branching-strategy-wasp-drone.mdFor all projects use ~/.claude/agents/. Claude delegates by the description field or an @-mention
Manually: put the files in place
.codex/agents/branching-strategy-wasp-drone.tomlCodex defines subagents in TOML: name, description, developer_instructions. Move the Markdown text into developer_instructions by hand. For all projects use ~/.codex/agents/
Manually: put the files in place
.cursor/agents/branching-strategy-wasp-drone.mdCursor also reads .claude/agents/
Step by step, with commands for each platform: Claude Code subagents: how to create one, call it and keep context clean
Questions about branching-strategy-wasp-drone
How do I install branching-strategy-wasp-drone in Claude Code?
Run these commands in order: /plugin marketplace add legioncodeinc/vibe-coding-tools, then /plugin install wasp-nest-core@wasp-nest, then load the config from .claude/agents/branching-strategy-wasp-drone.md.
What does branching-strategy-wasp-drone do?
It helps your team pick a branching model, identifies root causes of merge pain and release friction, recommends feature-flag strategy, and produces a branching policy document tailored to your release cadence and team structure.
How is branching-strategy-wasp-drone different from git-wasp-drone?
branching-strategy-wasp-drone decides which model to use and how to organize your workflow. git-wasp-drone handles Git mechanics: rebasing, conflict resolution, and history rewriting.