rebase

A procedure for rebasing a feature branch, meaning replaying its changes on top of the latest base branch, and resolving conflicts.

In plain words
What is it for?
Use it to inspect Git status, find the base branch, verify the repository is ready, replay commits, and resolve conflicts when permitted.
Why use it?
It helps bring branch changes up to date while treating the base branch as the source of truth and checking for unsafe repository states first.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/marcusjellinghaus/mcp-tools-sql/rebase
Any agent
npx skills add MarcusJellinghaus/mcp-tools-sql --skill rebase
Clone the repo
git clone --depth 1 https://github.com/MarcusJellinghaus/mcp-tools-sql

Made for: Claude Code, Codex.

Per session 10 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,114 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin 100% copy Near-identical to another mod in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00010 $0.01114
Opus 5 $0.00005 $0.00557
Sonnet 5 $0.00002 $0.00223
Haiku 4.5 $0.00001 $0.00111

Measured 3d ago against content hash c5f8f9e9e5d8, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

rebase scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 3d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

Origin

This is a copy

100% identical to rebase — 0 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.

.claude/skills/rebase/SKILL.md · 98 lines

How it starts

The opening of the file, as written. The whole thing — 98 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Rebase Branch onto Base Branch

First Step

Call mcp__mcp-workspace__git with command "status" before doing anything else.

Rebase the current feature branch onto its base branch and resolve conflicts.

Core philosophy: Main is the source of truth. The feature branch adapts to main. For source code conflicts, preserve main's improvements and rework the feature branch code to fit.

Note on --ours/--theirs during rebase: --ours = main (the branch being rebased onto), --theirs = feature branch commits being replayed.

If the rebase becomes complex, suggest switching to cherry-picking as an alternative approach.

Determine Base Branch

Call mcp__mcp-workspace__get_base_branch to detect the correct base branch. Use the returned branch name in subsequent git commands.

Base Branch Confirmation

If the base branch is not main or master, ask the user to confirm before proceeding. Display the detected base branch and wait for explicit approval.

Pre-flight Checks (Abort if any fail)

  1. Working directory is clean (no uncommitted changes)
  2. Not already in rebase/merge state
  3. Not on main/master branch
  4. Remote origin exists
  5. pr_info/ does not exist on the base branch — if it does, abort with error: "pr_info/ exists on <BASE_BRANCH>. This folder should only exist on feature branches. Check your branch setup."

Workflow

  1. Call mcp__mcp-workspace__git with command "fetch" and args ["origin"]
  2. git rebase origin/${BASE_BRANCH}
  3. For each conflict:
    • If file is under pr_info/: auto-resolve with git checkout --theirs <file> (keep feature branch version), then git add <file> — no user input needed
    • For all other files: resolve manually, preserving main's improvements; rework feature branch changes to fit
    • Verify no conflict markers remain
    • git add <file>
    • git rebase --continue
  4. Run code checks: mcp__mcp-tools-py__run_pytest_check, mcp__mcp-tools-py__run_pylint_check, mcp__mcp-tools-py__run_mypy_check
  5. Fix any issues from merge
  6. Report summary and ask for user confirmation
  7. git push --force-with-lease

Read the full file on GitHub · 98 lines

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 3d ago First seen · 98 lines · 10 tokens per session scan A c5f8f9e9e5d8

Subscribe to this mod's changes

rebase is a skill published in the GitHub repository MarcusJellinghaus/mcp-tools-sql (2 stars, last pushed 5d ago), licensed MIT. It adds 10 tokens to every session and 1,114 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. It is 100% identical to rebase, differing in 0 lines, and is treated as a copy.

Related

Other skills, from other repositories

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens

chat-perf

Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.

microsoft/vscode · 51 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens