Skills
.Work. You
Rest

kata-stacked-pr-rebase

Official

Cascade your stack PR fixes safely with rebase.

Software Engineering#git#worktrees#rebase#conflict resolution#stacked PRs#release workflow#force-with-lease
Authorguardiatechnology
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps you propagate changes made in a lower stack layer up through all upper layers in a stacked PR workflow without breaking the intended linear history.

Core Features & Use Cases

  • Layer identification & correct cascade order: Determines which stack branch changed and which upper layers must be rebased afterward (bottom-to-top).
  • Safe retargeting via rebase + lease-based force pushes: Rebases each upper layer on top of the updated previous layer and pushes updates using --force-with-lease to avoid overwriting others’ work.
  • Conflict handling and verification: Guides manual conflict resolution, continuation/abort, and checks that the final history matches expectations (and that main is not rebased in the cascade flow).

Quick Start

Ask the AI to generate a step-by-step cascade rebase plan for your stacked PRs that pushes the modified layer and then rebases and re-pushes all upper layers using git rebase plus git push --force-with-lease.

Dependency Matrix

Required Modules

None required

Components

Standard package

đź’» Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: kata-stacked-pr-rebase
Download link: https://github.com/guardiatechnology/design-system/archive/main.zip#kata-stacked-pr-rebase

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.