skills.rest
xriu
xriuCOMMUNITY
Explore all skills by this author →
GitHub

pr-stacked

Manages stacked pull requests and multi-base cherry-pick workflows across branches.

2|2|Updated Dec 23, 2017
Search Tags:#git#code review#pull request#rebase#cherry-pick#stacked prs#release branch
One-click install
npx skills add https://github.com/xriu/dotfiles --skill pr-stacked-xriu
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: pr-stacked
Source: https://github.com/xriu/dotfiles/tree/main/home/.skills/pr-stacked
Command: npx skills add https://github.com/xriu/dotfiles --skill pr-stacked-xriu

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Dependent pull requests and changes that must land on multiple branches often break when developers merge the default branch into a child PR or let sibling PRs drift apart, producing broken stacks and inconsistent releases. ## Core Features & Use Cases - Stacked PR Management: Updates a stack bottom-up by rebasing each child onto its updated parent rather than the default branch. - Multi-base Porting: Lands a change on the default branch, then cherry-picks identical code onto a release or production branch as a second PR. - Use Case: You have a feature split across three dependent PRs and the same fix must also ship on the release branch; this Skill guides rebasing each level correctly and keeping both base PRs identical with cross-linked descriptions. ## Quick Start Ask the assistant to update your stacked PRs after the parent branch changed, keeping each PR's base pointed at the one below it.

Frequently Asked Questions about pr-stacked

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

FAQPage Schema
How do I update a stacked pull request after the parent changes?▼

Update the parent branch first, then rebase the child onto the updated parent rather than the default branch. Push each level of the stack and keep every PR's base pointing at the PR directly below it.

How do I land the same change on main and a release branch?▼

Land the change on the default branch first, then cherry-pick the identical code onto the release branch as a second PR. Keep both PRs' code identical and note the sibling PR in each description.

Should I merge main into a stacked child PR?▼

No. Merging the default branch into the child collapses the stack and mixes unrelated changes. Rebase the child onto its updated parent branch instead to preserve the stack structure.

What happens if the two base PRs drift apart?▼

Drift between the default-branch PR and the release-branch PR causes inconsistent behavior across environments. Port the identical code via cherry-pick and verify both PRs contain the same diff before merging.

When should I not use stacked pull requests?▼

Avoid stacking when changes are independent and can be reviewed separately, or when the team's tooling cannot retarget PR bases automatically. In those cases, small independent PRs against the default branch are simpler.

Related Skills

Explore More Software Engineering Skills→
multigresmultigres
2.6k

draft-pr

Generates a PR title and description from the branch diff and creates a draft pull request.

Official
Basic
NVIDIANVIDIA
3.7k

release-cherry-pick

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

Official
Intermediate
devantler-techdevantler-tech
3

gh-stack

Manage and sync hierarchical software-brick and multi-branch workflows with Git-based tools.

Official
Advanced
learntocloudlearntocloud
801

gh-stack

Manage stacked branches and dependent pull requests with the gh-stack GitHub CLI extension.

Official
Advanced