mirror of https://github.com/fleetdm/fleet synced 2026-04-21 13:37:30 +00:00

Add cherry-pick kilocode skill (#42660 )

## Summary
- Adds a new kilocode skill for cherry-picking PRs onto release
candidate branches
- Codifies the single-session constraint to prevent duplicate PRs
- Documents branch naming, commit message format, and common issues

## Test plan
- [ ] Verify the skill is picked up by Kilo when prompted with a
cherry-pick task
- [ ] Confirm the documented steps match the existing cherry-pick
workflow

2026-04-07 12:28:56 -05:00

2.7 KiB

Raw Blame History

name	description
cherry-pick	Cherry-pick a merged PR onto a release candidate branch and open a new PR. Use when asked to cherry-pick, backport, or port a PR to an rc-minor or rc-patch branch.

Cherry-pick – kilocode skill

Important: single session only

Use only a single agent session for the entire cherry-pick. Multiple sessions for the same cherry-pick have caused duplicate PRs in the past.

Arguments

This skill expects two arguments:

Target branch — the release candidate branch (e.g., rc-minor-fleet-v4.83.0, rc-patch-fleet-v4.82.1)
Source PR — a GitHub PR URL or number from the fleetdm/fleet repo

Steps

Fetch the latest remote state
```
git fetch origin
```
Identify the merge commit — find the merge commit SHA for the source PR on main.
```
gh pr view <PR> --json mergeCommit --jq '.mergeCommit.oid'
```

Create a working branch from the target release branch:

git checkout -b cherry-pick-<PR_NUMBER>-to-<target-branch> origin/<target-branch>

Cherry-pick the merge commit using -m 1 (mainline parent):
```
git cherry-pick -m 1 <merge-commit-sha>
```
- If there are conflicts, resolve them and continue the cherry-pick.
- If the PR was a squash-merge (single commit, no merge commit), omit -m 1.

Push and open a PR against the target branch:

git push -u origin HEAD
gh pr create \
  --base <target-branch> \
  --title "Cherry-pick #<PR_NUMBER> onto <target-branch>" \
  --body "Cherry-pick of https://github.com/fleetdm/fleet/pull/<PR_NUMBER> onto the <target-branch> release branch."

Commit message format

Follow the established pattern:

Cherry-pick #<PR_NUMBER> onto <target-branch>

Cherry-pick of https://github.com/fleetdm/fleet/pull/<PR_NUMBER> onto the
<target-branch> release branch.

If the original commit has a Co-authored-by trailer, preserve it.

Branch naming

cherry-pick-<PR_NUMBER>-to-<target-branch>

Example: cherry-pick-41914-to-rc-minor-fleet-v4.83.0

Common issues

Duplicate PRs — never run multiple agent sessions for the same cherry-pick.
Conflict on cherry-pick — resolve conflicts manually, then git cherry-pick --continue.
Migration timestamp ordering — if the cherry-picked PR includes migrations, verify timestamps are in chronological order on the target branch.

References

Release process: https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/releasing-fleet.md
Backport checker: tools/release/backport-check.sh

This file will grow as new patterns and constraints are established.

2.7 KiB Raw Blame History Unescape Escape