Skip to main content
subagent CX Codex

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

Install into Claude Code · Plugin marketplace All methods and platforms ↓
/plugin marketplace add legioncodeinc/vibe-coding-tools
/plugin install wasp-nest-core@wasp-nest
Open on GitHub

What 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-nest

2Manually: put the files in place

.claude/agents/branching-strategy-wasp-drone.md

For all projects use ~/.claude/agents/. Claude delegates by the description field or an @-mention

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.

Similar subagents

All subagents for Git and GitHub →

From the same set172

The whole set →
investor-cap-table-wasp-drone investor-cap-table-wasp-drone walks founders through cap-table setup, SAFE mechanics and round paperwork. Tells you which platform fits and flags when a 409A valuation becomes due. CX Codex ★ 96repo stars workos-wasp-drone workos-wasp-drone — a subagent for WorkOS integration: AuthKit (UI and headless), sealed sessions, User Management, RBAC, SSO (SAML/OIDC), Directory Sync, MFA and migration from Supabase Auth or Clerk. CX Codex ★ 96repo stars deeplake-dataset-stinger deeplake-dataset-stinger is a Claude Code skill that designs and checks Deep Lake schemas for Wasp Nestmind, including ColumnDef, append-only versioning, and hybrid indexing. CX Codex +1 ★ 96repo stars live-chat-support-wasp-drone The live-chat-support-wasp-drone subagent helps plan support-platform choices and chat integrations, including widget setup, identity checks, routing, AI handling, and data export. CX Codex ★ 96repo stars incorporation-startup-stack-wasp-drone incorporation-startup-stack-wasp-drone guides startup founders through legal formation, registration platforms, banking, and critical 83(b) election deadlines before launch. CX Codex ★ 96repo stars markdown-mdx-content-pipeline-wasp-drone markdown-mdx-content-pipeline-wasp-drone — a subagent for building and reviewing Markdown/MDX pipelines from source files to HTML, JSX, or React output. Use it for compilers, plugin chains, highlighting, math, diagrams, and sanitization. CX Codex ★ 96repo stars audit-reporting-stinger audit-reporting-stinger is a Claude Code skill that renders final Website Auditor reports from the scored findings register. It runs in wave eight of an audit. CX Codex +1 ★ 96repo stars webapp-capture-stinger webapp-capture-stinger crawls running web applications through Playwright to extract design tokens, component inventories, and demo recordings. Useful when planning UI migrations or auditing design drift. CX Codex +1 ★ 96repo stars

Project sponsors

Companies that keep this analytics open