Rebase

Rebases current branch onto target with conflict resolution. Use when user wants to rebase, update branch base, or linearize history.

majiayu000 Updated 567 repo stars

File contents

Rebase

Fetch and rebase current branch onto: $ARGUMENTS (default: origin/main).

Task

Rebase the current branch onto the target branch. Resolve conflicts if any occur.

git fetch origin
git rebase $ARGUMENTS
# or default:
git rebase origin/main

If conflicts occur, analyze and resolve them, then continue the rebase.

majiayu000/claude-skill-registry-data/tree/main/development/rebase-sasamuku-dotfiles-2 commit 1ba07981f0

Frequently asked questions

npx skillmds@latest add majiayu000/rebase-5