How do I install the Rebase Assistant skill?

Run npx skillmds@latest add tomevault-io/rebase-assistant 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.

Is Rebase Assistant 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 Assistant?

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 Assistant free to use?

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

Who published Rebase Assistant?

tomevault-io (@tomevault-io) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Rebase Assistant by tomevault-io — Agent Skill

Name: Rebase Assistant
Author: tomevault-io

Rebase Assistant

Guide a safe git rebase of the current branch onto a target branch, including conflict triage and resolution steps. Use when asked to rebase, update a branch, or resolve rebase conflicts. Use when this capability is needed.

tomevault-io b580447 2 files · 3.0 KB Updated Sep 17, 2026

File contents

Rebase assistant

Goal

Rebase the current branch onto a target branch safely, with built-in conflict resolution guidance.

Inputs to confirm (ask if missing)

Target branch (explicit branch name or "default branch").
Preferred conflict bias when ambiguous: keep ours, keep theirs, or manual merge.
Protected paths or file types to avoid touching.

Workflow

Identify the target branch
- If user says "default branch": discover via git remote show origin (read "HEAD branch").
- If ambiguous or no remote: ask the user which branch to use.
Preflight checks
- git status -sb (must be clean before rebase).
- git fetch --prune to sync remotes.
- Optional safety branch (ask before creating): git branch backup/<current-branch>.
Start the rebase
- git rebase <target-branch>
If conflicts occur, resolve (repeat per file)
- Inspect conflict list:
  - git status -sb
  - git diff --name-only --diff-filter=U
- Classify and inspect:
  - Content conflicts: open file, resolve markers.
  - Delete/modify or rename conflicts: decide keep vs delete explicitly.
  - Binary conflicts: choose ours/theirs only.
- Show base/ours/theirs when useful:
  - git show :1:<path>
  - git show :2:<path>
  - git show :3:<path>
- File-level choice when safe:
  - git checkout --ours <path>
  - git checkout --theirs <path>
- Stage resolved files: git add <path>
- Continue: git rebase --continue
Finish and verify
- Ensure no conflicts: git status -sb
- Suggest a fast test/build if available.

Safety rules

Never run git reset --hard, git clean -fd, or git rebase --abort unless the user explicitly requests it.
Always show candidate commands before applying destructive changes.

Deliverables

The exact rebase command used and target branch.
Conflict list grouped by type with per-file resolution guidance.
Completion command and a short verification suggestion.

Converted and distributed by TomeVault — claim your Tome and manage your conversions.

---name: rebase-assistantdescription: Guide a safe git rebase of the current branch onto a target branch, including conflict triage and resolution steps. Use when asked to rebase, update a branch, or resolve rebase conflicts. Use when this capability is needed.---# Rebase assistant## GoalRebase the current branch onto a target branch safely, with built-in conflict resolution guidance.## Inputs to confirm (ask if missing)- Target branch (explicit branch name or "default branch").- Preferred conflict bias when ambiguous: keep ours, keep theirs, or manual merge.- Protected paths or file types to avoid touching.## Workflow1) Identify the target branch - If user says "default branch": discover via `git remote show origin` (read "HEAD branch"). - If ambiguous or no remote: ask the user which branch to use.2) Preflight checks - `git status -sb` (must be clean before rebase). - `git fetch --prune` to sync remotes. - Optional safety branch (ask before creating): `git branch backup/<current-branch>`.3) Start the rebase - `git rebase <target-branch>`4) If conflicts occur, resolve (repeat per file) - Inspect conflict list: - `git status -sb` - `git diff --name-only --diff-filter=U` - Classify and inspect: - Content conflicts: open file, resolve markers. - Delete/modify or rename conflicts: decide keep vs delete explicitly. - Binary conflicts: choose ours/theirs only. - Show base/ours/theirs when useful: - `git show :1:<path>` - `git show :2:<path>` - `git show :3:<path>` - File-level choice when safe: - `git checkout --ours <path>` - `git checkout --theirs <path>` - Stage resolved files: `git add <path>` - Continue: `git rebase --continue`5) Finish and verify - Ensure no conflicts: `git status -sb` - Suggest a fast test/build if available.## Safety rules- Never run `git reset --hard`, `git clean -fd`, or `git rebase --abort` unless the user explicitly requests it.- Always show candidate commands before applying destructive changes.## Deliverables- The exact rebase command used and target branch.- Conflict list grouped by type with per-file resolution guidance.- Completion command and a short verification suggestion.---> Converted and distributed by [TomeVault](https://tomevault.io/claim/jmerta) — claim your Tome and manage your conversions.

Frequently asked questions