stacked-pr

What problem does it solve?

This Skill streamlines the management of complex, multi-branch Git workflows, ensuring changes propagate correctly and conflicts are resolved efficiently across dependent branches.

Core Features & Use Cases

• Propagation Workflow: Guides users through rewriting parent branches and propagating changes to child branches using reset + cherry-pick.
• Fixup Targeting: Ensures fixup commits are applied to the correct target commit.
• Generated Commits: Manages deterministic commits (e.g., from codegen or dependency updates) using a drop-and-rerun pattern.
• Conflict Resolution: Provides clear strategies for mechanical, semantic, and generated conflicts.
• Use Case: When developing a large feature that requires several intermediate branches, this Skill helps maintain a clean, linear history and prevents merge hell.

Quick Start

Use the stacked-pr skill to propagate changes from the feature-a branch to its child feature-b.