Automate rebasing stacked Git branches after a squash merge.
npx skills add https://github.com/ESO-Toolkit/eso-toolkit --skill rebase-eso-toolkit
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
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.
twig for managing branch dependencies, with a fallback to plain Git commands.main, this skill helps you quickly rebase all dependent feature branches, preventing merge conflicts and keeping your development workflow smooth.Use the rebase skill to rebase the 'feature-branch' onto the 'main' branch.
High-intent search queries and answers about installing and using this skill.
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.
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.
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.
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.
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.
NodeJSmithDetect non-default parent branches and rebase Git worktrees onto them.
nachopalmeriFinalize a feature branch by merging, PRing, keeping, or discarding it after tests pass.
haleyrcSquash merge feature branch commits into main with a Conventional Commit message.
deepklarityDiagnose git merge, rebase, cherry-pick, or stash pop conflicts and guide resolution.