Skills
.Work. You
Rest

rebase-stack

Community

Rebase stacked diffs onto updated bases.

Software Engineering#git#rebase#conflict-resolution#branch-management#stacked-diffs#branch-a#branch-b
Authortbroadley
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Rebase-stack enables teams to keep a clean, linear history when working with stacked branches by rebasing Branch B onto an updated base (Branch A or main) so that changes from the base integrate smoothly.

Core Features & Use Cases

  • Base updates integration: Rebase Branch B onto Branch A when A has new commits to incorporate them without merging.
  • Conflict-aware rebasing: Guides you through resolving conflicts and applying only unique changes from Branch B.
  • History hygiene: Reduces merge noise by producing a linear commit history suitable for PR reviews.

Quick Start

From Branch B, rebase onto the latest base: git fetch origin git rebase --onto origin/branch-a $(git merge-base HEAD origin/branch-a) HEAD If conflicts occur, resolve them, then continue: git add <files> git rebase --continue git push --force-with-lease origin HEAD

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: rebase-stack
Download link: https://github.com/tbroadley/dotfiles/archive/main.zip#rebase-stack

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 223,000+ vetted skills library on demand.