rebase

Automate rebasing stacked Git branches after a squash merge.

2|Updated Aug 18, 2025

Search Tags:#automation #git #workflow #developer tools #branching #rebase

Ready to run

npx skills add https://github.com/ESO-Toolkit/eso-toolkit --skill rebase-eso-toolkit

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: rebase
Source: https://github.com/ESO-Toolkit/eso-toolkit/tree/main/.github/skills/rebase
Command: npx skills add https://github.com/ESO-Toolkit/eso-toolkit --skill rebase-eso-toolkit

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill automates the complex and error-prone process of rebasing Git branches after a feature branch has been squash-merged into the main branch, ensuring branch integrity and efficient workflow recovery.

Core Features & Use Cases

Automated Branch Recovery: Handles the reapplication of unique commits from child branches onto an updated main branch.
Conflict Resolution Assistance: Guides through the process of resolving cherry-pick conflicts.
Dependency Management: Utilizes twig for managing branch dependencies, with a fallback to plain Git commands.
Use Case: After a large feature branch is squash-merged into main, this skill helps you quickly rebase all dependent feature branches, preventing merge conflicts and keeping your development workflow smooth.

Quick Start

Use the rebase skill to rebase the 'feature-branch' onto the 'main' branch.

Frequently Asked Questions about rebase

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

FAQPage Schema

How do I rebase stacked Git branches after a squash merge into the main branch?▼

Rebasing stacked Git branches after a squash merge involves cherry-picking unique commits from child branches onto the updated main branch. This automated process re-establishes branch dependencies and resolves squash conflicts to maintain workflow integrity.

What is the best way to manage Git branch dependencies during a rebase?▼

Managing Git branch dependencies during a rebase is best handled using the Twig tool to re-establish relationships between stacked branches. If Twig is unavailable, the process falls back to using plain Git commands for branch recovery.

How does cherry-picking work when resolving squash merge conflicts on dependent branches?▼

Cherry-picking during squash conflict resolution applies unique commits from a child branch onto the main branch. This guided process ensures that only the necessary changes are reapplied, resolving conflicts to restore branch integrity.

Do I need the Twig tool installed to automate Git branch recovery?▼

You do not need the Twig tool installed to automate Git branch recovery. The workflow utilizes Twig for managing branch dependencies, but includes an automated fallback to plain Git commands when Twig is unavailable.

Why does rebasing a feature branch after a squash merge cause conflicts?▼

Rebasing a feature branch after a squash merge causes conflicts because the main branch history has been condensed into a single new commit. Stacked child branches still reference the old commits, requiring cherry-picking to resolve the mismatch.