How do I install the Rebase skill?

Run npx skillmds@latest add marcusjellinghaus/rebase in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.

What does the Rebase skill do?

Rebase feature branch onto base branch with conflict resolution It is listed under Coding & Dev Tools on SkillMD.

Is Rebase safe to use?

This skill has not completed SkillMD's automated safety review yet. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with Rebase?

This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.

Is Rebase free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published Rebase?

MarcusJellinghaus (@marcusjellinghaus) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Rebase by marcusjellinghaus — Agent Skill

Name: Rebase
Author: MarcusJellinghaus

File contents

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

Conflict Resolution Strategies

File Type	Strategy
`pr_info/` files	Auto-resolve with `--theirs` (keep feature branch version)
Code files (`.py`, `.js`, etc.)	Keep both sides, merge imports
Test files	Keep all tests from both sides
Config files	Merge additively, prefer HEAD for same keys
Lockfiles (`-lock.json`, `.lock`)	Accept theirs (`--theirs`), notify user to regenerate after rebase

Abort Rules (in priority order)

Any unexpected error - abort, report full error
Binary file conflict - abort, cannot auto-resolve
Conflict markers remain after resolution - abort
Same file conflicts 3+ times - abort
Code quality fails after 2 fix attempts - abort
Any other unexpected situation - abort, suggest manual intervention

On abort: run git rebase --abort, report which rule triggered, suggest next steps.

---name: rebasedescription: Rebase feature branch onto base branch with conflict resolution---# Rebase Branch onto Base Branch## First StepCall `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 BranchCall `mcp__mcp-workspace__get_base_branch` to detect the correct base branch. Use the returned branch name in subsequent git commands.## Base Branch ConfirmationIf 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 state3. Not on main/master branch4. Remote origin exists5. `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."`## Workflow1. 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 merge6. Report summary and ask for user confirmation7. `git push --force-with-lease`## Conflict Resolution Strategies| File Type | Strategy ||-----------|----------|| `pr_info/` files | Auto-resolve with `--theirs` (keep feature branch version) || Code files (`.py`, `.js`, etc.) | Keep both sides, merge imports || Test files | Keep all tests from both sides || Config files | Merge additively, prefer HEAD for same keys || Lockfiles (`*-lock.json`, `*.lock`) | Accept theirs (`--theirs`), notify user to regenerate after rebase |## Abort Rules (in priority order)1. Any unexpected error - abort, report full error2. Binary file conflict - abort, cannot auto-resolve3. Conflict markers remain after resolution - abort4. Same file conflicts 3+ times - abort5. Code quality fails after 2 fix attempts - abort6. Any other unexpected situation - abort, suggest manual interventionOn abort: run `git rebase --abort`, report which rule triggered, suggest next steps.

Frequently asked questions

Rebase