Unique-AG/ai / .claude/skills/hotfix-backport
hotfix-backport
VerifiedBackport fixes from main onto release/YYYY.WW in the ai repo with cherry-pick and rebase merge so release-please changelogs stay correct. Use when hotfixing a release branch, cherry-picking to release/*, or preparing a release backport PR.
Hotfix backport to release/*
Workflow
- Identify commits on
mainto backport (merge commits or PR numbers). - Branch from the target release branch:
git fetch origin main release/YYYY.WW git checkout -b hotfix/UN-XXXXX origin/release/YYYY.WW - Cherry-pick in order (oldest first):
git cherry-pick <sha1> <sha2> ... - Open a PR targeting
release/YYYY.WWwith a list of backported commits/PRs in the description. - Merge with Rebase and merge only (squash is blocked by branch rules).
CI guardrails
.github/scripts/check-release-lineage.sh— each PR commit must be onmainor patch-equivalent (git cherry -prefix). Cherry-picks get new SHAs; identical hashes are not required. No commit-metadata bypass (author/subject are forgeable).release-please--*PRs skip lineage inci.yaml(automation-owned version/changelog bumps).- Do not squash-merge: one squashed commit breaks release-please changelog generation.
- Changelog fragments must land on
mainfirst and arrive via the cherry-pick. A release-only fragment would conflict whenchangelog-batch.yamlmirrors the hotfix batch tomain; the lineage check already rejects such commits.
After the fix PR merges
release-please opens chore: hotfix release/YYYY.WW to YYYY.WW.N. Approve and rebase-merge that PR too. PyPI publish follows the GitHub Release event.
Related
release-process— versioning and changelog ownershipgit-conventional-commits— commit subjects on cherry-picked commits must stay conventionalmodel-deploymentLESSONS-LEARNED — monorepo pins after AI packages ship
Related skills
| Skill | Stars | Updated | Works with | Status | Install |
|---|---|---|---|---|---|
| slack-gif-creatoranthropics/skillsKnowledge and utilities for creating animated GIFs optimized for Slack. Provides constraints, validation tools, and animation concepts. Use when users request animated GIFs for Slack like "make me a GIF of X doing Y for Slack." | Stars: 197k | Updated | Claude CodeCodex | Verified | Install |
| ponytailDietrichGebert/ponytailLazy senior dev mode for any coding task: the smallest change that fully solves it, and a reply a busy human understands in one read. | Stars: 194k | Updated | Claude CodeCodex | Verified | Install |
| ponytail-debtDietrichGebert/ponytailHarvest every shortcut: comment into one debt ledger, so deferrals get tracked instead of forgotten. One-shot report. | Stars: 194k | Updated | Claude CodeCodex | Verified | Install |
| ponytail-debtDietrichGebert/ponytailList every `shortcut:` comment (and older `ponytail:` ones) as a debt ledger. One-shot report, changes nothing. Use for "ponytail debt", "what did ponytail defer", "list the shortcuts", /ponytail-debt. | Stars: 194k | Updated | Claude CodeCodex | Verified | Install |