skills.rest
thachrocky12345
thachrocky12345COMMUNITY
Explore all skills by this author →
GitHub

sdk-backmerge

Creates the backmerge pull request that lands release version bumps and changelogs onto main.

Updated May 11, 2026
Search Tags:#git#changelog#pull request#cherry-pick#release workflow#github cli#backmerge
One-click install
npx skills add https://github.com/thachrocky12345/local-agent-train-workstation --skill sdk-backmerge-thachrocky12345
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: sdk-backmerge
Source: https://github.com/thachrocky12345/local-agent-train-workstation/tree/main/qvac/.cursor/skills/sdk-backmerge
Command: npx skills add https://github.com/thachrocky12345/local-agent-train-workstation --skill sdk-backmerge-thachrocky12345

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? After shipping an SDK pod release from a release-<pkg>-<x.y.z> branch, the version bump and changelog metadata never reach main unless someone manually cherry-picks them, causing version drift and missing changelog entries. This Skill automates the follow-up backmerge PR so main stays aligned with what shipped. ## Core Features & Use Cases - Automated cherry-pick workflow: Resolves the release source range (from a chained release PR, a merged PR's squash commit, or an explicit --commit SHA) and cherry-picks it onto a backmerge/release-<pkg>-<x.y.z> branch with -x traceability. - No-op detection: Uses git merge-tree to detect when main already contains the release content, stopping before pushing an empty branch or failing gh pr create. - Guided conflict triage: Auto-resolves known conflicts (version field in package.json, regenerating the aggregated CHANGELOG.md) and hands control back to the user for anything else. - Use Case: After merging a release PR for release-wallet-1.4.0, invoke the Skill to open a [skiplog]-tagged PR that lands the version bump, changelog files, and NOTICE updates onto main. ## Quick Start Ask the assistant to run /sdk-backmerge with the release PR URL to open the backmerge PR that lands the release metadata onto main.

Frequently Asked Questions about sdk-backmerge

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

FAQPage Schema
How do I backmerge a release branch into main after a release PR?▼

Run the backmerge workflow with the release PR URL or number. It cherry-picks the release metadata (version bump, changelog, NOTICE) onto a backmerge/release-<pkg>-<x.y.z> branch from upstream/main and opens a [skiplog]-tagged PR targeting main.

How do I cherry-pick a squashed release PR commit onto another branch?▼

Fetch the PR's merge or squash commit with gh pr view <num> --json mergeCommit,headRefName, then cherry-pick it with -x onto a branch cut from upstream/main. For true merge commits, add -m 1 to specify the mainline parent.

What happens if main already contains the release changes?▼

The workflow detects this no-op case using git merge-tree to compare the simulated cherry-pick tree against main's current tree. If identical, it stops without creating a branch or PR and reports the commit that already landed the release content.

How are cherry-pick conflicts resolved during a backmerge?▼

Known conflicts are auto-resolved: package.json version fields take the release side, and the aggregated CHANGELOG.md is regenerated with the changelog script. Any other conflict stops the workflow and hands resolution back to the user with resume instructions.

When should I not create a backmerge PR?▼

Skip it when main already contains the release content, which the no-op check detects automatically. Also stop if the source range diff shows broad unrelated changes, indicating the branch was based off main rather than the release branch.

Related Skills

Explore More Software Engineering Skills→
hiivmindhiivmind

prepare-release

Automate release branches, version bumps, changelogs, and PR creation to main.

Official
Advanced
fcsonlinefcsonline
49

pr-workflow

Enforces PR-based development workflowbforking direct pushes to the main branch.

Community
Intermediate
whitebearditwhitebeardit
12

conventional-commits

Validate commit messages and PR titles against Conventional Commits rules.

Official
Intermediate
NVIDIANVIDIA
3.7k

release-cherry-pick

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

Official
Intermediate