Skip to content

Unique-AG/ai / .claude/skills/hotfix-backport

hotfix-backport

Verified

Backport 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

  1. Identify commits on main to backport (merge commits or PR numbers).
  2. Branch from the target release branch:
    git fetch origin main release/YYYY.WW
    git checkout -b hotfix/UN-XXXXX origin/release/YYYY.WW
    
  3. Cherry-pick in order (oldest first):
    git cherry-pick <sha1> <sha2> ...
    
  4. Open a PR targeting release/YYYY.WW with a list of backported commits/PRs in the description.
  5. 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 on main or 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 in ci.yaml (automation-owned version/changelog bumps).
  • Do not squash-merge: one squashed commit breaks release-please changelog generation.
  • Changelog fragments must land on main first and arrive via the cherry-pick. A release-only fragment would conflict when changelog-batch.yaml mirrors the hotfix batch to main; 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 ownership
  • git-conventional-commits — commit subjects on cherry-picked commits must stay conventional
  • model-deployment LESSONS-LEARNED — monorepo pins after AI packages ship
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: 197kUpdated Claude CodeCodexVerifiedInstall
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: 194kUpdated Claude CodeCodexVerifiedInstall
ponytail-debtDietrichGebert/ponytailHarvest every shortcut: comment into one debt ledger, so deferrals get tracked instead of forgotten. One-shot report.Stars: 194kUpdated Claude CodeCodexVerifiedInstall
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: 194kUpdated Claude CodeCodexVerifiedInstall