Skip to content
Kitbay
Skill

zed-cherry-pick

NOASSERTIONUpdated on Nov 11, 202694,739GitHub stars

A maintainer skill in the Zed repository for porting merged pull requests or commits to Zed's preview or stable release branch when the automated cherry-pick workflow fails, usually on a merge conflict.

What the skill teaches

A maintainer skill in the Zed repository for porting merged pull requests or commits to Zed's preview or stable release branch when the automated cherry-pick workflow fails, usually on a merge conflict. The agent gathers the merge commits in the order they landed, reads the failed run's logs, recreates the branch the script would have made, and first checks whether earlier fixes are missing from the release branch. Only then does it resolve conflicts with the smallest change that keeps the original intent, runs cargo check and tests on the affected crates, and opens a pull request whose branch name, title and body match what the automation produces. It reports the link, conflicts and test results.

Capabilities

  • Read failed cherry-pick workflow logs
  • Port merged commits to a release branch in landing order
  • Resolve conflicts and check affected Rust crates
  • Open a pull request in the automated format