Gitflow
Manage a gitflow branching workflow, starting and finishing feature, release, and hotfix branches; cutting versioned releases with changelog generation; coordinating emergency hotfixes directly to production; and keeping long-lived branches in sync. Activates when users mention gitflow, feature/release/hotfix branches, cutting a release, branching strategy, promoting an integration branch to production, tagging a version, or rolling back a live release. Also reaches for it when the user says "promote dev to main" or "we need to hotfix prod" without naming gitflow. Not for a single commit message (use git-commit). Not for versioned releases on a simple main-branch workflow with no release/hotfix branches (use git-release). Not for the mechanical review-to-merge pipeline on a branch with no release/hotfix topology involved (use ship). Skip for general git mechanics (merge conflicts, interactive rebase, git education) or CI-failure debugging unrelated to a release.From its SKILL.md
npx -y skills add mgiovani/cc-arsenal --skill gitflowAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
One thing to look at
- 8 stars8 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
SKILL.md
5.4 KB, as published. Nobody here has run it
Gitflow
This skill covers the full gitflow branching model with two long-lived branches and short-lived branches off them.
mainis production. Merging tomaintriggers your deploy pipeline. Treat every merge tomainas a production deploy that your users will see shortly after.dev(sometimes calleddevelop) is the integration branch. Day-to-day feature and fix work lands here first.- Short-lived branches:
feat/<desc>andfix/<desc>offdev,release/<x.y.z>offdev,hotfix/<x.y.z>offmain.
Pick the flow
Read the matching reference in full and follow it step by step. Each one is self-contained.
| The user wants to... | Flow | Read |
|---|---|---|
Ship the accumulated dev work to production | Release | references/release.md |
| Get an urgent fix into production now, can't wait for a release | Hotfix | references/hotfix.md |
| Build a new feature or a fix that will ride the next release | Feature | references/feature.md |
If the intent is ambiguous (e.g. "ship the settings fix"), ask one question: is this urgent enough to go straight to production (hotfix), or does it ride the next release (feature now, release later)?
Universal rails
These apply to every flow. They exist because main is live production and a mistake here is user-visible, so the cost of a shortcut is real.
mainis a deploy button. Never merge tomainwhile any CI check is not green. The full Definition-of-Done gate runs on a PR tomain; wait for all of it. Poll CI every few minutes rather than tight-looping, to keep token cost sane. No CI pipeline configured on the repo? Skip the wait-for-green step and say so explicitly before merging.- Always update
CHANGELOG.mdduring a release and a hotfix (never per-feature; the changelog is assembled at ship time). Seereferences/changelog.mdfor the format. - Conventional Commits. Follow the Conventional Commits spec. Keep commit messages, PR titles, PR bodies, the changelog, and release notes clean and professional.
- Never force-push. Never bypass git hooks (
--no-verifyor equivalent). The pre-push hooks are part of the safety net. If a push fails due to a hook, investigate and root-fix the underlying issue; never bypass. - Stage only the files you intend. Prefer
git add <specific-files>over blanket staging commands. Verify what you are about to stage withgit diff --stagedbefore committing. - Verify before every push. Run
git log --oneline <base>..HEADandgit diff --stat <base>..HEADso you know exactly what is going to the remote, especially before anything that touchesmain. - After any merge to
main(release or hotfix), open a break-glass revert PR and leave it OPEN. It is the one-click rollback. Never merge it yourself. See the shared procedure inreferences/release.md(the revert step is identical for hotfix).
Versioning
Semantic versioning. The current version lives in your project manifest (package.json, pyproject.toml, Cargo.toml, etc.) on both long-lived branches (kept in sync; both are at the last released version). No version manifest in the repo? Version via the latest git tag alone and skip the bump-file step.
- Release: bump minor for new features (e.g.
1.1.0to1.2.0), major for breaking changes. - Hotfix: bump patch (e.g.
1.1.0to1.1.1). - The tag is
v<x.y.z>, annotated, placed on the merge commit onmain.
Merge methods (they differ by target, on purpose)
- Feature/fix PR into
dev: squash merge (one clean commit per PR with the(#NNN)suffix). This keepsdevhistory readable. release/*orhotfix/*intomain: merge commit (--no-ff). This preserves the release as a first-parent merge so the break-glass revert (git revert -m 1) is clean.- Back-merge
release/*orhotfix/*intodev: merge commit.
Delete short-lived branches yourself once they are merged everywhere they need to go.
Stay in the loop
These flows touch production. When CI is running or a deploy is in flight, report each milestone to the user as it lands (CI green, merged, deploy healthy, tagged) rather than going silent. If any gate is red, stop and root-fix; do not merge around it.
What ships with it: 6 files
17.1 KB alongside SKILL.md
evals/
- evals.json4.2 KB
- trigger-eval.json2.5 KB
references/
- changelog.md2.1 KB
- feature.md1.9 KB
- hotfix.md2.6 KB
- release.md3.8 KB
Gives 1 of the 12 instructions most ship operate skills give
Counted across 1,077 of the 1,713 authors here whose files we hold, read 2026-09-06
- Create GitHub releasein 44 of 1077, across 43 files
- Run the test suitein 30 of 1077, across 25 files
- Create and push git tagin 27 of 1077, across 26 files
- Push commits and tagsin 27 of 1077
- Create annotated tagin 25 of 1077, across 22 files
- Ensure working tree is cleanin 24 of 1077
- Check for product marketing context firstin 23 of 1077, across 6 files
- Commit version bump changesin 22 of 1077, across 21 files
- Update CHANGELOG.mdhere, and in 21 of 1077, across 20 files
- Structure launch marketing across three channel typesin 20 of 1077, across 5 files
- Commit and tag the releasein 20 of 1077, across 18 files
- Update the CHANGELOG for new releasesin 19 of 1077
Said here and by no other author read
- Never merge to main while CI is not green
- Follow the Conventional Commits specification
- Never force push or bypass git hooks
- Open a break glass revert PR after merging to main
- Use squash merge for feature PRs into dev
- Use merge commits for release and hotfix merges
Grouped from the skills themselves: near-identical wordings counted once, and counted by distinct author, so one author publishing three of these counts once.