stacked-diffs

Manage stacked dependent PRs and branches using git and gh CLI.

3|Updated Nov 21, 2020

Search Tags:#automation #git #workflow #branch #stack #gh #pull-request

Ready to run

npx skills add https://github.com/EduardoSimon/dotfiles --skill stacked-diffs-eduardosimon

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: stacked-diffs
Source: https://github.com/EduardoSimon/dotfiles/tree/main/dot_claude/skills/stacked-diffs
Command: npx skills add https://github.com/EduardoSimon/dotfiles --skill stacked-diffs-eduardosimon

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Manage stacked diffs (dependent PRs/branches) using pure git + gh CLI. It enables creation, navigation, syncing, landing (with squash-merge support), and PR submission.

Core Features & Use Cases

Create and initialize a new stack from a base branch.
Add subsequent branches with automatic ordering and per-branch metadata.
View status, navigate between stack branches, and sync after upstream changes.
Land merged branches by rebasing remaining branches onto the updated base and updating PR bases.

Quick Start

Create a new stack named <stack> starting from main, then add the first stacked branch and push to origin.

Frequently Asked Questions about stacked-diffs

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

FAQPage Schema

How do I manage stacked diffs with git and gh CLI?▼

Manage stacked diffs by initializing a new stack from a base branch, adding ordered dependent branches, and syncing upstream changes. This Skill coordinates navigation, metadata storage, and GitHub PR integration using pure git and gh commands.

What is the best way to sync dependent pull requests after an upstream merge?▼

Sync dependent pull requests after an upstream merge by rebasing remaining branches onto the updated base. The Skill automatically updates PR bases and maintains per-branch metadata to keep the stack consistent.

Can I land stacked branches with squash merge support?▼

Yes, you can land merged branches with squash merge support by rebasing remaining branches onto the updated base. The Skill updates PR bases and maintains branch ordering during the landing process.

Do I need external tools to coordinate stacked PRs or is pure git enough?▼

Pure git and gh CLI are enough to coordinate stacked PRs without external tools. The Skill uses git config storage for per-branch and per-stack metadata, handling creation, navigation, and landing natively.

Why does rebasing a stacked branch break the pull request chain?▼

Rebasing a stacked branch breaks the pull request chain when PR bases are not updated to reflect the new commit history. The Skill solves this by automatically updating PR bases and syncing remaining branches onto the updated base.