# git-flow-manager

A Claude subagent that creates Git Flow branches, merges them, tags releases and opens pull requests. Useful when the branching scheme is strict but nobody follows it by hand.

- subagent · `type=agent` · Claude Code · 3127 installs
- Author: davila7
- License: not stated · policy=link-only · description only; the file stays with the author
- Source: https://github.com/davila7/claude-code-templates/tree/HEAD/cli-tool/components/agents/git/git-flow-manager.md
- Updated: 2026-10-24
- HTML: https://affpapa.org/en/nevibecode/agents/git-flow-manager

## What it does

Three branch types are covered: `feature/*` off `develop`, `release/*` off `develop`, `hotfix/*` off `main`. Before branching, the subagent checks that the name matches the convention and that the base branch is the right one. When work is done it merges where the scheme says: a feature into `develop` only, a release or hotfix into `main` and `develop` with a tag.

Commit messages get rewritten into Conventional Commits using `feat`, `fix`, `docs`, `style`, `refactor`, `test` and `chore`. A release bumps the version in `package.json`, builds `CHANGELOG.md` from the commit history and opens a PR with the `gh` CLI. Merge conflicts are walked through step by step: conflicting files are shown, both sides explained, a fix proposed.

The subagent works with `Read`, `Bash`, `Grep`, `Glob`, `Edit` and `Write`. Pull request generation needs an installed and authenticated `gh`, otherwise that step fails. A direct push to `main` or `develop` is treated as an error, and you get a branch suggestion instead.

## Install

### Claude Code (native platform)

1. **claude-code-templates**
```bash
npx claude-code-templates@latest --agent git/git-flow-manager
```

2. **Manually: put the files in place**
- File: `.claude/agents/git-flow-manager.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/git-flow-manager.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/git-flow-manager.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/davila7/claude-code-templates/tree/HEAD/cli-tool/components/agents/git/git-flow-manager.md

## When to use it
- start a feature branch from an up-to-date `develop` with remote tracking set
- merge a release into `main` and `develop` and tag it
- ship a hotfix from `main` without dropping the change from `develop`
- keep commit messages in Conventional Commits format
- build a CHANGELOG and PR body from commit history

## Example prompts
- Create `feature/user-authentication` from `develop` and push it
- Finish `release/v1.2.0`: merge into `main` and `develop`, then tag it
- Resolve the conflicts in this merge and commit the result

## Similar
- [git-workflow](https://affpapa.org/en/nevibecode/skills/git-workflow.md) — skill · 5000 installs
- [deployment-engineer](https://affpapa.org/en/nevibecode/agents/deployment-engineer.md) — subagent · 6079 installs
- [launchdarkly-flag-cleanup](https://affpapa.org/en/nevibecode/agents/launchdarkly-flag-cleanup.md) — subagent · 171 installs
- [pr-test-analyzer](https://affpapa.org/en/nevibecode/agents/pr-test-analyzer.md) — subagent · ★ 44770
- [Technical Debt Remediation Plan](https://affpapa.org/en/nevibecode/agents/technical-debt-remediation-plan.md) — subagent · ★ 40451
- [TDD Red Phase - Write Failing Tests First](https://affpapa.org/en/nevibecode/agents/tdd-red-phase-write-failing-tests-first.md) — subagent · ★ 40451
- [TDD Green Phase - Make Tests Pass Quickly](https://affpapa.org/en/nevibecode/agents/tdd-green-phase-make-tests-pass-quickly.md) — subagent · ★ 40451

From the same set: [davila7/claude-code-templates](https://affpapa.org/en/nevibecode/by/davila7/claude-code-templates.md) — 495 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