git-cherry-pick-hotfix
Git Cherry Pick Hotfix
Overview
Use this skill to backport urgent fixes quickly while controlling dependency spillover and regression risk.
Scope Boundaries
- Use this skill when the task matches the trigger condition described in
description. - Do not use this skill when the primary task falls outside this skill's domain.
Shared References
- Dependency decision rules:
references/cherry-pick-dependency-rules.md
Templates And Assets
- Hotfix cherry-pick plan:
assets/hotfix-cherry-pick-plan-template.md
- Verification checklist:
assets/hotfix-verification-checklist.md
Inputs To Gather
- Source fix commit hashes and dependency notes.
- Target branch constraints and release timeline.
- Verification scope for target environment.
- Rollback expectations for failed backport.
Deliverables
- Cherry-pick plan with dependency analysis.
- Source-to-target commit mapping record.
- Post-pick verification evidence.
- Rollback notes if target behavior diverges.
Workflow
- Build plan in
assets/hotfix-cherry-pick-plan-template.md. - Validate dependency scope using
references/cherry-pick-dependency-rules.md. - Apply minimal commit set in dependency-safe order.
- Resolve conflicts and run target-branch verification.
- Finalize with
assets/hotfix-verification-checklist.md.
Quality Standard
- Picked commits are minimal and intent-preserving.
- Hidden dependencies are explicitly documented.
- Target branch behavior matches fix objective.
- Rollback path exists before production rollout.
Failure Conditions
- Stop when backport requires broad dependency migration.
- Stop when target branch cannot satisfy fix prerequisites.
- Escalate when behavior diverges from source assumptions after pick.
More from kentoshimizu/sw-agent-skills
graph-algorithms
Graph algorithm workflow for modeling entities/relations and selecting traversal, path, ordering, or flow strategies. Use when correctness or performance depends on graph representation and algorithm choice; do not use for schema-only modeling or deployment topology planning.
14bash-style-guide
Style, review, and refactoring standards for Bash shell scripting. Trigger when `.sh` files, files with `#!/usr/bin/env bash` or `#!/bin/bash`, or CI workflow blocks with `shell: bash` are created, modified, or reviewed and Bash-specific quality controls (quoting safety, error handling, portability, readability) must be enforced. Do not use for generic POSIX `sh`, PowerShell, or language-specific application style rules. In multi-language pull requests, run together with other applicable `*-style-guide` skills.
11architecture-clean-architecture
Clean Architecture workflow for enforcing dependency direction, stable domain boundaries, and use-case-centered application design. Use when teams must separate business rules from frameworks and delivery mechanisms; do not use for isolated module cleanup without boundary implications.
11powershell-style-guide
Style, review, and refactoring standards for PowerShell scripting. Trigger when `.ps1`, `.psm1`, `.psd1` files, or CI workflow blocks with `shell: pwsh` or `shell: powershell` are created, modified, or reviewed and PowerShell-specific quality controls (error handling, parameter validation, readability, operational safety) must be enforced. Do not use for Bash, generic POSIX `sh`, or language-specific application style rules. In multi-language pull requests, run together with other applicable `*-style-guide` skills.
10github-codeowners-management
Govern CODEOWNERS rules so review routing reflects real ownership and risk boundaries on GitHub. Use when repository ownership mapping or mandatory reviewer rules must be defined, updated, or audited; do not use for non-GitHub runtime architecture or data-layer design.
9security-authentication
Security workflow for authentication architecture, credential lifecycle, and session/token assurance. Use when login, identity proofing, MFA, or session security decisions are required; do not use for authorization policy design or non-security quality tuning.
9