Agent skill · software engineering · zed-industries
zed-cherry-pick
Cherry-pick one or more merged PRs and/or commits into Zed's `preview` or `stable` release branch. Use this whenever the user mentions cherry-picking to preview/stable, a failed cherry-pick run, or wants to manually port fix(es) into a release branch.
Why this skill is useful
Adds a specific script for cherry-picking commits that includes domain-specific knowledge about Zed's release branches and GitHub Actions workflows.
What it needs
Requires gh installed locally. About 5k tokens when loaded. Last updated 2026-08-07. 88,167 stars on the source repository.
What this skill does
Zed Cherry-Pick Zed ships from two long-lived release branches that live on origin: preview channel → branch like v1.4.x stable channel → branch like v1.3.x The version numbers change with each release. Never hardcode them — always discover the current mapping (see Finding the target branch). A merged PR on main gets ported to a release branch by script/cherry-pick, normally driven by the cherrypick GitHub Actions workflow. When that workflow fails (almost always a merge conflict), use this skill to finish the job locally and open the cherry-pick PR by hand. When to use Use this when the user asks to cherry-pick one or more commits and/or Pull Requests (by number or URL) to preview or stable. Optionally, the user may specify whether to resolve merge conflicts; if unspecified, attempt the cherry-pick, and then if there are merge conflicts in practice, stop and inform the user that there are merge conflicts and offer to resolve them. (Users may prefer to resolve the merge conflicts themselves before continuing.) The script you're emulating The canonical procedure lives in script/cherry-pick and the cherrypick GitHub Actions workflow. Read the script first if anything looks off — your local steps must produce the same branch name, PR title, and PR body it would. Signature: script/cherry-pick <branch-name> <commit-sha> <channel> <branch-name> is the release branch (e.g. v1.4.x), not the channel name. <channel> is preview or stable, used only for display text in the PR title/body. It creates a local branch named cherry-pick-<branch-name>-<short-sha> (the short SHA is the first 8 chars of the commit), force-pushes it to origin, and opens a PR. Finding the target branch The channel→branch mapping changes every release. Find the current one by inspecting the most recent cherrypick workflow runs: A successful run prints both BRANCH: and CHANNEL: env vars; that's your mapping. Procedure 1. …
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills zed-industries/zed-cherry-pick