rebase
- Repo stars 2,380
- License MIT
- Author updated Live
- Author repo dotfiles
- Domain
- Engineering
- Compatible agents
-
- Claude Code
- Cursor
- Cline
- Codex
- Windsurf
- Gemini CLI
- +20
- Trust score
- 94 / 100 · audit passed
- Author / version / license
- @ryanb · MIT
- Token usage
- Lean
- Setup complexity
- Guided setup
- External API key
- Not required
- Operating systems
- Unspecified (assume cross-platform)
- Runtime requirements
- No special requirements
- Permissions
-
- Read-only
- Shell exec
- Write / modify
- Network behavior
- External requests
- Install commands
- 26 variants
Profile is derived at build time from SKILL.md and install vectors. Subject to drift from author intent.
Heads up: 未限定 allowed-tools，默认拥有全部工具权限。
---
name: rebase
description: Interactive rebase onto a base branch, resolving conflicts along the way and verifying tests pas…
category: engineering
runtime: no special runtime
---
# rebase output preview
## PART A: Task fit
- Use case: Interactive rebase onto a base branch, resolving conflicts along the way and verifying tests pass. Compares against remote when done. Rebase the current branch onto a base branch, resolving conflicts and verifying tests along the way. makes outbound network calls. Works with Claude Code, Cursor, Cline and 23 more..
- Inputs: target material, constraints, expected output, and acceptance criteria.
- Evidence boundary: follow “Step 1: Determine base branch / Step 2: Start the rebase / Step 3: Resolve conflicts” and do not present inference as author intent.
## PART B: Execution result
- **01** The card summarizes the use case; runtime output centers on “Interactive rebase onto a base branch, resolving conflicts along the way and verifying tests pass. Compares against remote when done. Rebase the current branch onto a base branch, resolving conflicts and verifying tests along the way. makes outbound network calls. Works with Claude Code, Cursor, Cline and 23 more.”.
- **02** When the source has headings, the agent prioritizes “Step 1: Determine base branch / Step 2: Start the rebase / Step 3: Resolve conflicts” so the result follows the author’s structure.
- **03** Typical output includes task judgment, concrete steps, required commands or file edits, validation, and follow-up options.
- **04** Risk context follows the fingerprint: read files, run shell commands, write/modify files; may access external network resources; usually needs no extra API key.
## Running Rules
- read files, run shell commands, write/modify files; may access external network resources; usually needs no extra API key.
- Validate with a small sample before expanding scope.
- Return the result, validation criteria, and next iteration options.The source mentions slash commands such as `/remote-diff`; use them first when your agent supports command triggers.
Name target files or source material, expected output, forbidden changes, and whether network or shell access is allowed. Permission fingerprint: read files, run shell commands, write/modify files.
Start with a small task and check whether the result follows “Step 1: Determine base branch / Step 2: Start the rebase / Step 3: Resolve conflicts”. Inspect diffs, logs, previews, or tests before expanding scope.
Confirm the final output includes a concrete result, evidence, and next action. If it stays generic, tighten inputs, boundaries, and acceptance criteria.
---
name: rebase
description: Interactive rebase onto a base branch, resolving conflicts along the way and verifying tests pas…
category: engineering
source: ryanb/dotfiles
---
# rebase
## When to use
- Interactive rebase onto a base branch, resolving conflicts along the way and verifying tests pass. Compares against re…
- Use it when the task has clear inputs, repeatable steps, and validation criteria.
## What to provide
- Target material, scope, expected result, and forbidden changes.
- Whether network, commands, file writes, or external services are allowed.
## Execution rules
- Organize steps around “Step 1: Determine base branch / Step 2: Start the rebase / Step 3: Resolve conflicts” and keep inference separate from source facts.
- read files, run shell commands, write/modify files; may access external network resources; usually needs no extra API key.
- Validate with a small sample before expanding the task.
## Output requirements
- Return the deliverable, key evidence, validation method, and next action.
- Mark missing information as unknown; do not invent commands, platforms, or dependencies.The author source anchors workflow facts; repository files anchor sources and commands; Fluxly only adds fit, limitations, and quality judgment.
skill "rebase" {
input -> user goal + target files + boundaries + acceptance criteria
context -> Step 1: Determine base branch / Step 2: Start the rebase / Step 3: Resolve conflicts
rules -> SKILL.md triggers / order / output contract
runtime -> no special runtime | read files, run shell commands, write/modify files | may access external network resources
guardrails -> usually needs no extra API key + small-sample validation + diff/log review
output -> copyable result + checklist + next iteration
}Rebase
Rebase the current branch onto a base branch, resolving conflicts and verifying tests along the way.
Step 1: Determine base branch
Determine the base branch in this order:
- Use
$ARGUMENTSif the user specifies a branch - Use
bin/base-branchif the script exists and is executable - Ask the user which branch to rebase onto
Step 2: Start the rebase
Fetch latest and begin the rebase:
git fetch origin
git rebase origin/<base-branch>If the rebase completes with no conflicts, skip to Step 6.
Step 3: Resolve conflicts
- Identify the conflicting files with
git diff --name-only --diff-filter=U - Read each conflicting file and understand both sides of the conflict
- Resolve the conflict by taking both sides into account — don't blindly pick one side. Understand the intent of each change and produce a result that incorporates both correctly.
- Stage the resolved files with
git add
If a conflict is ambiguous and you can't confidently determine the correct resolution, ask the user.
Step 4: Run related tests
Run the tests related to the files that had conflicts. If tests fail due to the conflict resolution, fix them before proceeding.
If tests fail but seem unrelated to the rebase, verify by stashing and testing:
git stash
# run tests again
git stash pop- If tests also fail without your changes, the failures are pre-existing. Note this for the user and continue.
- If tests only fail with your changes, the rebase introduced the problem. Investigate and fix.
If you are unable to resolve test failures, let the user know what's broken and what you tried.
Step 5: Continue the rebase
git rebase --continueIf there are more conflicts, go back to Step 3. Repeat until the rebase is complete.
Step 6: Check remote and compare
Check if a remote tracking branch exists:
git rev-parse --verify @{u} 2>/dev/nullIf a remote branch exists, run the /remote-diff skill to compare the rebase result against the remote and flag any potential issues.
If no remote branch exists, skip this step and report that the rebase is complete.
Decide Fit First
Design Intent
How To Use It
Boundaries And Review