Rebase the current feature branch onto origin/main with conflict handling and status reporting.
npx skills add https://github.com/flurdy/agent-skills --skill rebase-main
Please help me install this Agent Skill. Skill: rebase-main Source: https://github.com/flurdy/agent-skills/tree/main/skills/rebase-main Command: npx skills add https://github.com/flurdy/agent-skills --skill rebase-main
Rebase the current branch onto the latest main branch to incorporate updates from main into your feature branch.
From your feature branch, run the /rebase-main command to apply the latest main updates onto your branch.
High-intent search queries and answers about installing and using this skill.
To rebase a feature branch onto main, run the command to fetch origin main and then rebase onto origin/main, integrating updated commits from main into your branch while keeping it synchronized.
When conflicts occur during a rebase onto main, the workflow detects them and guides you through resolution steps, allowing you to resolve the conflicts, continue the rebase, or abort it entirely.
You need to rebase a feature branch against main when the main branch has progressed and you must incorporate those updates into your branch, such as when preparing a pull request or maintaining collaborative workflows.
Yes, the rebase workflow verifies the branch is up-to-date and generates a final status report that includes commit counts and the synchronization outcome after applying main updates.
Yes, if conflicts during the rebase process become too complex, the workflow includes an optional abort step to safely cancel the rebase and return your feature branch to its original state.
dyoshikawaAnalyze git differences and commit history between the current branch and origin main.
AbildtoftRebase the current branch onto the latest base branch and force-push with --force-with-lease.
maggitPlan and execute non-interactive git rebase operations with safety checks.
sluongngRebase fork/stack onto origin/main and publish merge commits to fork/main.
