claude-dev-flow

Resolve git rebase conflicts one block at a time with verification. Use when rebasing, resolving merge conflicts, or continuing a rebase. Works with git rerere. Always keeps HEAD by default, verifies with grep, never uses bulk operations. Delegates file edits to subagents.

Manage git-flow branching workflows. Use when working with feature branches, release branches, hotfixes, or configuring branching strategy. Supports Classic GitFlow, GitHub Flow, GitLab Flow, and custom configurations.

Initialize git-flow, manage feature/release/hotfix branches, and coordinate multi-component releases. Use when setting up branching strategy, starting/finishing branches, or releasing with semantic versioning. Integrates with release-process skill.

Plan and execute releases with semantic versioning and bracket-based freezing. Use when: "how do I release", "bump the version", "write the changelog", "what version comes next", "release the plugin", or managing scope creep in monorepos. Prevents version thrashing; supports single projects, monorepos, and multi-component systems.