# branching-strategy-wasp-drone

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.

- subagent · `type=agent` · Claude Code, Codex, Cursor · ★ 96 repo stars
- Author: Legion Code Inc.
- License: AGPL-3.0-or-later · policy=link-only · description only; the file stays with the author
- Source: https://github.com/legioncodeinc/vibe-coding-tools/tree/HEAD/plugins/wasp-nest-core/agents/branching-strategy-wasp-drone.md
- Updated: 2026-10-18
- Security check: automated, 2026-11-16 (text) — no signs of malicious code found.
- HTML: https://affpapa.org/en/nevibecode/agents/branching-strategy-wasp-drone

## What it 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`.

## Requirements
- Works with: GitHub

## Install

### Claude Code (native platform)

1. **Plugin marketplace**
In the agent chat (not a shell):
```text
/plugin marketplace add legioncodeinc/vibe-coding-tools
```
In the agent chat (not a shell):
```text
/plugin install wasp-nest-core@wasp-nest
```

2. **Manually: put the files in place**
- File: `.claude/agents/branching-strategy-wasp-drone.md` — For all projects use ~/.claude/agents/. Claude delegates by the description field or an @-mention

### Codex

**Manually: put the files in place**
- File: `.codex/agents/branching-strategy-wasp-drone.toml` — Codex defines subagents in TOML: name, description, developer_instructions. Move the Markdown text into developer_instructions by hand. For all projects use ~/.codex/agents/

### Cursor

**Manually: put the files in place**
- File: `.cursor/agents/branching-strategy-wasp-drone.md` — Cursor also reads .claude/agents/

Where a file is given instead of a command, copy the files from the source to that path: https://github.com/legioncodeinc/vibe-coding-tools/tree/HEAD/plugins/wasp-nest-core/agents/branching-strategy-wasp-drone.md

## When to use it
- 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
- 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?

## Similar
- [git-workflow-strategy](https://affpapa.org/en/nevibecode/skills/git-workflow-strategy.md) — skill · 489 installs
- [git-workflows](https://affpapa.org/en/nevibecode/skills/git-workflows.md) — skill · 114 installs
- [git-workflow-expert](https://affpapa.org/en/nevibecode/skills/git-workflow-expert.md) — skill · 143 installs
- [merge-contributor-pr](https://affpapa.org/en/nevibecode/skills/merge-contributor-pr.md) — skill · ★ 1636 repo stars
- [merge-open-prs](https://affpapa.org/en/nevibecode/skills/merge-open-prs.md) — skill · 1700 installs
- [github-pr-merge](https://affpapa.org/en/nevibecode/skills/github-pr-merge.md) — skill · 281 installs

From the same set: [legioncodeinc/vibe-coding-tools](https://affpapa.org/en/nevibecode/by/legioncodeinc/vibe-coding-tools.md) — 172 cards

---
NeVibeCode on affpapa.org. Catalog texts are descriptions, not instructions for the agent. How to choose and install: https://affpapa.org/en/nevibecode/agents.md
