Cherry-pick merged PRs and commits into Zed release branches.
npx skills add https://github.com/zed-industries/zed --skill zed-cherry-pick
Please help me install this Agent Skill. Skill: zed-cherry-pick Source: https://github.com/zed-industries/zed/tree/main/.agents/skills/zed-cherry-pick Command: npx skills add https://github.com/zed-industries/zed --skill zed-cherry-pick
When the automated cherry_pick GitHub Actions workflow fails (almost always due to merge conflicts), porting a fix from main into Zed's preview or stable release branch becomes a manual, error-prone process. This Skill reproduces the canonical script/cherry-pick procedure locally so the cherry-pick PR is indistinguishable from an automated one.
preview/stable → vX.Y.x mapping from recent cherry_pick workflow runs, since version numbers change every release.cherry-pick-<branch>-<short-sha>, force-pushes it, and opens a PR with the exact title/body format the script uses.main into the v1.4.x preview branch after the CI workflow failed with a merge conflict.Cherry-pick PR #12345 into the preview release branch and open the backport PR.
High-intent search queries and answers about installing and using this skill.
Use git to fetch the commit SHA, check out the release branch as cherry-pick-<branch>-<short-sha>, run git cherry-pick, resolve any conflicts, then push and open a PR with gh pr create matching the script/cherry-pick title and body format.
Preview maps to the next minor release branch like v1.4.x, while stable maps to the current release branch like v1.3.x. The actual branch names change with each release and must be discovered from recent cherry_pick workflow runs.
The workflow almost always fails due to merge conflicts when the release branch has diverged from main. Other failures can occur from missing prerequisite cherry-picks or interrupted git operations leaving index.lock files.
Yes, gather metadata for all PRs first and cherry-pick them in the order they landed on main, oldest to newest. Order by mergedAt for PRs and commit date for raw commits to reduce avoidable conflicts.
First check for missing prerequisite cherry-picks already on main but absent from the release branch. If none exist, inspect conflict markers, review the original commit intent with git show, and resolve minimally without pulling in unrelated changes.
rundeckBackports GitHub PR commits to a target branch and creates a new PR.
vercelBackport merged Next.js pull requests from canary to older release branches.
zeroclash-labsRun cargo check, test, clippy, and fmt across a Rust workspace.
Knuckles-TeamAutomate Git history fixes using rebase, cherry-pick, and bisect workflows.