Rebase stacked Git branches onto an updated main branch with conflict guidance.
npx skills add https://github.com/ahoym/dotfiles --skill git-cascade-rebase
Please help me install this Agent Skill. Skill: git-cascade-rebase Source: https://github.com/ahoym/dotfiles/tree/main/.claude/commands/git-cascade-rebase Command: npx skills add https://github.com/ahoym/dotfiles --skill git-cascade-rebase
This Skill automates the complex process of rebasing a series of dependent Git branches when the main branch has been updated, preventing merge conflicts and keeping feature branches up-to-date.
feature/A, feature/B, feature/C), and main has been updated. This Skill helps you reapply feature/A onto main, then feature/B onto the new feature/A, and so on, ensuring a clean history.Run the cascade rebase command with your branches listed in order from closest to main to furthest.
High-intent search queries and answers about installing and using this skill.
To rebase stacked Git branches, you sequentially reapply each dependent feature branch onto the updated main branch, managing dependencies to keep feature branches current and maintain a clean history.
Handling merge conflicts during a cascade rebase involves following specific provided steps and Git commands to resolve issues locally before continuing the sequence to ensure branch integrity.
Yes, you need Git CLI to automate rebasing a chain of dependent branches, as the process requires executing branch validation, recording commit hashes, and running force-push commands.
You can safely force-push stacked branches after rebasing by using the `--force-with-lease` command, which prevents accidentally overwriting remote changes made by other collaborators.
You should use a cascade rebase when you have multiple feature branches stacked on each other and need to update them sequentially against a newly updated main branch.
julianobarbosaAutomates Git workflows including commit, push, pull request creation, and merge with built-in security checks and CLI integration.
dtsongPush local Git commits to a remote repository with upstream handling.
julianobarbosaAutomate Git commit, branch, merge, and PR workflows with GitHub CLI and security checks.
cbleckerRebase a feature branch onto an updated base branch with conflict guidance.