git-flow-manager — Claude Code subagent: runs Git Flow
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.
npx claude-code-templates@latest --agent git/git-flow-managerWhat git-flow-manager 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.
What it helps with
- start a feature branch from an up-to-date
developwith remote tracking set - merge a release into
mainanddevelopand tag it - ship a hotfix from
mainwithout dropping the change fromdevelop - keep commit messages in Conventional Commits format
- build a CHANGELOG and PR body from commit history
Example prompts for the agent
- Create
feature/user-authenticationfromdevelopand push it - Finish
release/v1.2.0: merge intomainanddevelop, then tag it - Resolve the conflicts in this merge and commit the result
How to install git-flow-manager
1claude-code-templates
npx claude-code-templates@latest --agent git/git-flow-manager2Manually: put the files in place
.claude/agents/git-flow-manager.mdFor all projects use ~/.claude/agents/. Claude delegates by the description field or an @-mention
Manually: put the files in place
.codex/agents/git-flow-manager.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/git-flow-manager.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 git-flow-manager
How do I install git-flow-manager in Claude Code?
Run npx claude-code-templates@latest --agent git/git-flow-manager. The subagent file lands at .claude/agents/git-flow-manager.md.
What does git-flow-manager do?
It handles Git Flow operations: branch creation and validation, merging along the scheme, tagging releases and hotfixes, and generating pull requests.
What is required to open a pull request?
The subagent uses the gh CLI, so it has to be installed and authenticated. It pushes the branch to the remote first.