skills.rest
flurdy
flurdyCOMMUNITY
Explore all skills by this author →
Website𝕏@flurdyGitHub

rebase-merged-parent

Rebase a feature branch onto main after a parent PR merges.

6|Updated Jan 22, 2026
Search Tags:#git#commits#rebase#branch-management#pull-request#main
One-click install
npx skills add https://github.com/flurdy/agent-skills --skill rebase-merged-parent
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-merged-parent
Source: https://github.com/flurdy/agent-skills/tree/main/skills/rebase-merged-parent
Command: npx skills add https://github.com/flurdy/agent-skills --skill rebase-merged-parent

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Rebase after a parent PR has been merged to main. Use when your branch was stacked on another PR that has now been merged, and you need to rebase onto main while keeping only your commits.

Core Features & Use Cases

  • Rebase onto main and drop merged parent's commits from history.
  • Update the PR base to main to reflect the latest target.
  • Handles common edge cases like unchanged main or missing parent references.

Quick Start

Run /rebase-merged-parent feature/old-parent to rebase your branch onto main.

Frequently Asked Questions about rebase-merged-parent

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

FAQPage Schema
How do I rebase a stacked branch onto main after the parent PR is merged?▼

Rebasing a stacked branch onto main after a parent PR merge requires rebalancing your Git history to drop the merged parent's commits. This preserves only your commits and updates the PR base to target main.

What happens to parent commits when rebasing onto main?▼

When rebasing onto main, parent commits that were already merged are dropped from your branch history. The process ensures the final history retains only your commits while updating the PR to target main.

How do I update the PR base to main after a parent branch merge?▼

Updating the PR base to main requires rebalancing your Git history after the parent branch merge. You rebase your feature branch onto main to ensure the final history retains only your commits while updating the PR target.

Do I need advanced Git knowledge to rebase a feature branch onto main?▼

Yes, rebasing a feature branch onto main requires knowledge of Git commands and collaborative workflows where branches are stacked on merged parents. It involves advanced branch management to preserve only your commits.

What are common edge cases when rebasing a stacked branch onto main?▼

Common edge cases when rebasing a stacked branch onto main include an unchanged main branch or missing parent references. The process handles these scenarios to ensure your history retains only your commits.

Related Skills

Explore More Software Engineering Skills→
athal7athal7
6

branching

Automate stacked Git branch management with git-spice.

Community
Intermediate
chriswesttchriswestt

ship

Merge the base branch, run tests, and create a pull request.

Community
Advanced
fpindejfpindej
230

create-pr

Create pull requests for Git repositories with commit history analysis and templates.

Community
Advanced
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced