rebase-parent

Rebase the current branch onto an updated parent PR branch using git and gh.

6|Updated Jan 22, 2026
One-click install
npx skills add https://github.com/flurdy/agent-skills --skill rebase-parent
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: rebase-parent
Source: https://github.com/flurdy/agent-skills/tree/main/skills/rebase-parent
Command: npx skills add https://github.com/flurdy/agent-skills --skill rebase-parent

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Rebase the current branch onto an updated parent PR branch to keep your PRs aligned when the parent has new commits or was force-pushed.

Core Features & Use Cases

  • Rebase your feature branch onto the updated parent to preserve your commits while aligning with the new base
  • Detect and handle simple conflicts with guidance and safe fallbacks
  • Ideal for workflows with stacked PRs where the parent branch evolves during review

Quick Start

Initiate the rebase by issuing the /rebase-parent command while on your feature branch.

Frequently Asked Questions about rebase-parent

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

FAQPage Schema
How do I rebase a stacked PR branch after the parent branch is updated?

You can rebase your stacked PR branch onto an updated parent branch using a targeted git rebase --onto command, preserving your commits while aligning with the new base and handling conflicts with safe fallbacks.

What is the best way to handle stacked PRs when a parent branch gets force-pushed?

To handle stacked PRs when a parent branch is force-pushed, use a targeted rebase onto the updated parent branch to align your feature commits with the new base without losing your work.

Do I need gh CLI queries to rebase a branch onto its parent PR?

Yes, rebasing onto an updated parent PR branch requires the gh CLI to query PR details, alongside git to execute the targeted rebase and resolve any conflicts.

How does a targeted git rebase --onto work for stacked branches?

A targeted git rebase --onto works by transplanting your feature commits onto the updated parent branch, detecting simple conflicts during the rebase process and providing guidance for safe fallbacks.

What should I do if I hit conflicts while rebasing onto a parent branch?

If you hit conflicts while rebasing onto a parent branch, the process provides conflict resolution guidance and safe fallbacks to ensure your feature commits align correctly with the updated base.