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

Use it to inspect Git status, find the base branch, verify the repository is ready, replay commits, and resolve conflicts when permitted.

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.

How MarcusJellinghaus/mcp-tools-sql configures Claude Code

Reuse

Borrowing it

Nothing to install: this file belongs to MarcusJellinghaus/mcp-tools-sql. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.

Copy the file

curl -O https://raw.githubusercontent.com/MarcusJellinghaus/mcp-tools-sql/main/.claude/skills/rebase/SKILL.md

Clone the repo

git clone --depth 1 https://github.com/MarcusJellinghaus/mcp-tools-sql

Made for: Claude Code.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

README.md

[![agentmods](https://agentmods.dev/badge/skills/marcusjellinghaus/mcp-tools-sql/rebase/github.svg)](https://agentmods.dev/skills/marcusjellinghaus/mcp-tools-sql/rebase)

Your own site

<a href="https://agentmods.dev/skills/marcusjellinghaus/mcp-tools-sql/rebase"><img src="https://agentmods.dev/badge/skills/marcusjellinghaus/mcp-tools-sql/rebase/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

Your own site · 80×15

<a href="https://agentmods.dev/skills/marcusjellinghaus/mcp-tools-sql/rebase"><img src="https://agentmods.dev/badge/skills/marcusjellinghaus/mcp-tools-sql/rebase.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

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. A grade says what 26 rules found in the file — not that it is safe.

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.

Model	Per session	Once invoked
Fable 5.1	$0.00010	$0.01114
Opus 5.5	$0.00004	$0.00446
Sonnet 5.5	$0.00002	$0.00223
Haiku 4.5	$0.00001	$0.00111

Measured 1mo ago against content hash c5f8f9e9e5d8, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, 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 1mo 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)

Working directory is clean (no uncommitted changes)
Not already in rebase/merge state
Not on main/master branch
Remote origin exists
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

Call mcp__mcp-workspace__git with command "fetch" and args ["origin"]
git rebase origin/${BASE_BRANCH}
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
Run code checks: mcp__mcp-tools-py__run_pytest_check, mcp__mcp-tools-py__run_pylint_check, mcp__mcp-tools-py__run_mypy_check
Fix any issues from merge
Report summary and ask for user confirmation
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.

rebase_design.md 2.5 KB

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.

1mo 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 2d ago), licensed MIT. It adds 10 tokens to every session and 1,114 once invoked, about $0.0000 per session on Opus 5.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.

Git and workflow

mcp-tools-sql: Skill for Claude Code

Borrowing it

Wrote this? Show the measurements

What it costs to keep this loaded

Grade A, and why

Nothing flagged

This is a copy

How it starts

Rebase Branch onto Base Branch

First Step

Determine Base Branch

Base Branch Confirmation

Pre-flight Checks (Abort if any fail)

Workflow

What ships with it

What this file has done since we first saw it

Other skills, from other repositories

merge-batch

prowler-commit

gh-auth-isolation

comet-github

github-skill

release-helper