skills.rest
Comfy-Org
Comfy-OrgOFFICIAL
Explore all skills by this author →
Website𝕏@comfyuiGitHub

backport-management

Manages cherry-pick backports of merged PRs to stable release branches on GitHub.

2.0k|679|Updated Jun 13, 2024
Search Tags:#conflict resolution#cherry-pick#release engineering#gitHub#backport#ci verification#release branches
One-click install
npx skills add https://github.com/Comfy-Org/ComfyUI_frontend --skill backport-management
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: backport-management
Source: https://github.com/Comfy-Org/ComfyUI_frontend/tree/main/.claude/skills/backport-management
Command: npx skills add https://github.com/Comfy-Org/ComfyUI_frontend --skill backport-management

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Backporting dozens of merged PRs to stable release branches is error-prone: candidates get missed, conflicts get mis-resolved, CI gets bypassed, and branches break silently. This Skill provides a disciplined end-to-end workflow for discovering, triaging, executing, and verifying cherry-pick backports across core and cloud release branches.

Core Features & Use Cases

  • Candidate Discovery & Triage: Reconciles Slack bot flags with git log gap analysis, pre-filters by changed file paths, and buckets PRs into tiered MUST/SHOULD/SKIP categories before human review.
  • Conflict-Aware Execution: Runs test-then-resolve dry-runs to classify clean vs conflicting cherry-picks, uses label-driven GitHub Actions automation for clean PRs, and falls back to manual worktree resolution with categorized conflict patterns (binary snapshots, modify/delete, component rewrites, locale files).
  • Verification & Reporting: Enforces CI-before-merge rules, per-PR and per-wave typecheck/test validation, and generates Slack-compatible session reports and author accountability lists.
  • Use Case: After a two-week development cycle, 60 fix PRs have merged to main but the core/1.42 and cloud/1.42 release branches are behind. Use this Skill to discover the gap, interactively approve candidates, auto-backport clean PRs, manually resolve conflicts, and ship verified release branches.

Quick Start

Ask the agent to run a backport session for the core/1.42 and cloud/1.42 release branches of ComfyUI_frontend, starting with candidate discovery and tiered triage.

Frequently Asked Questions about backport-management

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I backport merged PRs to a stable release branch on GitHub?▼

Discover candidates by reconciling Slack bot flags with git log gap analysis, triage them into tiers, then apply labels like needs-backport and the target branch to trigger the pr-backport.yaml automation. Conflicting PRs fall back to manual git worktree cherry-picks with categorized conflict resolution.

How do I resolve cherry-pick conflicts during a backport?▼

Categorize conflicts first: binary snapshots use git checkout --theirs, modify/delete uses git add or git rm, and simple content conflicts use an accept-theirs regex. For component rewrites with 4+ markers in a .vue file, use git show MERGE_SHA:path to take the complete file from the merge commit instead.

Should I use gh pr merge --admin to merge backport PRs?▼

No, never admin-merge without CI passing, because --admin bypasses all branch protection including required status checks. Use --auto --squash so PRs merge only after CI succeeds, or verify checks are green with gh pr checks before merging.

Which PRs should be skipped when backporting to stable branches?▼

Skip dependency refresh PRs, CI and tooling changes, test-only or lint changes, revert pairs, and features that do not exist on the target branch. Cloud-only PRs like team workspaces should not go to core branches, though app mode and Firebase auth changes apply to both.

Why does typecheck fail after a clean cherry-pick?▼

The cherry-picked PR may reference composables, components, or types introduced by an earlier PR that was never backported. Detect this with pnpm typecheck errors like Cannot find module, then add the missing files from the merge commit using git show MERGE_SHA:path.

Related Skills

Explore More Software Engineering Skills→
rsyslogrsyslog
2.3k

rsyslog_v8stable_patch_flow

Track changelogs, handle pull requests, and merge rsyslog v8-stable patches into main.

Official
Intermediate
kagentikagenti
16

release-notes

Generate Markdown release notes from merged PRs between version tags.

Official
Intermediate
NVIDIANVIDIA
3.7k

release-cherry-pick

Cherry-pick labeled merged PRs into a release branch and open a tracking PR.

Official
Intermediate
IploopIploop
10

proxyclaw

Route web requests through residential proxies with geo-targeting and session persistence.

Official
Advanced