Stats
Actions
Tags
'%20stop-opacity%3D'0.16'%2F%3E%3Cstop%20offset%3D'1'%20stop-color%3D'rgb(200%2C90%2C60)'%20stop-opacity%3D'0.03'%2F%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Crect%20width%3D'320'%20height%3D'200'%20fill%3D'url(%23g)'%2F%3E%3Ccircle%20cx%3D'250'%20cy%3D'56'%20r%3D'92'%20fill%3D'rgb(200%2C90%2C60)'%20fill-opacity%3D'0.06'%2F%3E%3Ccircle%20cx%3D'64'%20cy%3D'172'%20r%3D'58'%20fill%3D'rgb(200%2C90%2C60)'%20fill-opacity%3D'0.05'%2F%3E%3C%2Fsvg%3E)
From update-branch
Rebases the current feature branch onto its upstream branch, resolving merge conflicts and running the full test suite after completion.
How this command is triggered — by the user, by Claude, or both
Slash command
/update-branch:rebaseThe summary Claude sees in its command listing — used to decide when to auto-load this command
Rebase the current feature branch onto the latest upstream branch and resolve conflicts. ## Steps 1. Verify the current branch and its upstream: 2. Fetch the latest changes from remote: 3. Check for potential conflicts before rebasing: 4. Start the rebase: 5. If conflicts occur: 6. After successful rebase: 7. Report the rebase result. ## Format ## Rules - Always use `--force-with-lease` instead of `--force` for safety. - Never rebase shared branches that others are working on. - Run the full test suite after rebasing.
Rebase the current feature branch onto the latest upstream branch and resolve conflicts.
Branch: <branch name>
Base: <upstream branch>
Commits Rebased: <count>
Conflicts: <count resolved>
--force-with-lease instead of --force for safety.5plugins reuse this command
First indexed Mar 30, 2026
npx claudepluginhub smarks26/awesome-claude-code-toolkit --plugin update-branch/rebaseRebases the current feature branch onto its upstream branch, resolving merge conflicts and running the full test suite after completion.
/rebaseRebases current branch onto specified feature branch using worktrees and tmux, with automatic conflict resolution. Launches tmux session for monitoring progress.
/rebaseInteractively rebase current branch onto target (default origin/main), with safety checks, conflict guidance, and post-rebase push reminder.
/rebase-helperAnalyzes the current branch and produces a safe, step-by-step rebase plan against a target branch, including conflict prediction and recovery commands.
/rebase-allRebases all branches onto a configurable upstream branch, iteratively resolving conflicts via git:conflict-resolver until all succeed.
/rebase-mainRebases current branch onto main, handling worktrees, auto-stashing uncommitted changes if needed, and reporting results.