Install the "rebase" agent skill from https://github.com/deadlock-mod-manager/deadlock-mod-manager/tree/main/.agents/skills/rebase into .claude/skills/rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase", then confirm the skill loads.
Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Type this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
skills CLI
$ npx skills add deadlock-mod-manager/deadlock-mod-manager --skill rebase -a codex
Project install goes to .agents/skills/; add -g for ~/.codex/skills/.
GitHub CLI
$ gh skill install deadlock-mod-manager/deadlock-mod-manager rebase --agent codex
Project scope by default (.agents/skills/); add --scope user for a personal install.
Install the "rebase" agent skill from https://github.com/deadlock-mod-manager/deadlock-mod-manager/tree/main/.agents/skills/rebase into .agents/skills/rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase", then confirm the skill loads.
Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
skills CLI
$ npx skills add deadlock-mod-manager/deadlock-mod-manager --skill rebase -a cursor
Project install goes to .agents/skills/; add -g for ~/.cursor/skills/.
GitHub CLI
$ gh skill install deadlock-mod-manager/deadlock-mod-manager rebase --agent cursor
Project scope by default (.agents/skills/); add --scope user for a personal install.
Install the "rebase" agent skill from https://github.com/deadlock-mod-manager/deadlock-mod-manager/tree/main/.agents/skills/rebase into .cursor/skills/rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase", then confirm the skill loads.
Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
skills CLI
$ npx skills add deadlock-mod-manager/deadlock-mod-manager --skill rebase -a gemini-cli
Project install goes to .agents/skills/; add -g for ~/.gemini/skills/.
GitHub CLI
$ gh skill install deadlock-mod-manager/deadlock-mod-manager rebase --agent gemini-cli
Project scope by default (.agents/skills/); add --scope user for a personal install.
Install the "rebase" agent skill from https://github.com/deadlock-mod-manager/deadlock-mod-manager/tree/main/.agents/skills/rebase into .gemini/skills/rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase", then confirm the skill loads.
Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
GitHub CLI
$ gh skill install deadlock-mod-manager/deadlock-mod-manager rebase
Installs for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
skills CLI
$ npx skills add deadlock-mod-manager/deadlock-mod-manager --skill rebase -a github-copilot
Project install goes to .agents/skills/; add -g for ~/.copilot/skills/.
Install the "rebase" agent skill from https://github.com/deadlock-mod-manager/deadlock-mod-manager/tree/main/.agents/skills/rebase into .github/skills/rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase", then confirm the skill loads.
GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
skills CLI
$ npx skills add deadlock-mod-manager/deadlock-mod-manager --skill rebase -a opencode
OpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
GitHub CLI
$ gh skill install deadlock-mod-manager/deadlock-mod-manager rebase --agent opencode
Project scope by default (.agents/skills/); add --scope user for a personal install.
Install the "rebase" agent skill from https://github.com/deadlock-mod-manager/deadlock-mod-manager/tree/main/.agents/skills/rebase into .opencode/skills/rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase", then confirm the skill loads.
OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
Skill name
rebase
GitHub stars
473
Token cost
~1.9k tokens
SKILL.md length
832 words
Files
1
Skills in repo
23
Repo updated
First seen
Licence
GPL-3.0
At a glance
Fetch the latest default branch and rebase the current branch on top of it, resolving any merge conflicts automatically.
Works in 6 steps: Pre-Flight Checks → Fetch the Latest Base → Start the Rebase → …
Asked to rebase
SKILL.md covers Step 1: Pre-Flight Checks, Step 2: Fetch the Latest Base, Step 3: Start the Rebase and Step 4: Resolve Conflicts (Loop), plus 3 more sections
Calls git, cargo and pnpm
What it does
Rebase is an agent skill from deadlock-mod-manager/deadlock-mod-manager. Fetch the latest default branch and rebase the current branch on top of it, resolving any merge conflicts automatically. Use when asked to "rebase", "rebase on main", "update branch with main", "sync with main", "rebase onto latest", or "/rebase".
Its SKILL.md is about 1.9k tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: A mod manager for the Valve game Deadlock. The licence is GPL-3.0.
When your agent uses it
Asked to rebase
Update branch with main
Rebase onto latest
Example prompts
“rebase”
“rebase on main”
“update branch with main”
“/rebase”
Requirements
Node.js
Workflow steps
6 steps, taken from the step headings in SKILL.md.
Read from SKILL.md and the folder at commit 8bb56d1. It shows what the files ask for, not the result of running them.
Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
Shell commands in SKILL.md call:
git
cargo
pnpm
gh
npm
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, pnpm, gh and npm, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Context cost
Rebase loads about 1.9k tokens when it runs. Until then it costs about 64 tokens; SKILL.md has 832 words of instructions outside code blocks.
Always· name and description, kept in context so the agent knows when to use it
~64
When it runs· the whole SKILL.md, loaded when a task matches
~1.9k
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
Safety
Auto-check passed
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
Download SKILL.mdSave it as .claude/skills/rebase/SKILL.md (or your agent's skills folder).
name
rebase
description
Fetch the latest default branch and rebase the current branch on top of it, resolving any merge conflicts automatically. Use when asked to "rebase", "rebase on main", "update branch with main", "sync with main", "rebase onto latest", or "/rebase".
Rebase Current Branch on Latest Main
Fetch the latest default branch from origin and rebase the current branch on top of it, resolving conflicts as they appear. Do not push unless the user asks.
Step 1: Pre-Flight Checks
Before doing anything, verify the working tree state:
Run git status --porcelain=v1 --branch. Confirm there are no uncommitted changes. If there are:
List them to the user
Ask whether to stash (git stash push -u -m "rebase-skill autostash") or abort
Do NOT silently discard work
Run git rev-parse --abbrev-ref HEAD to capture the current branch name. If it is main, master, or the default branch, stop and tell the user there is nothing to rebase.
Fall back to git symbolic-ref refs/remotes/origin/HEAD --short | sed 's@^origin/@@' if gh is unavailable. Cache the result as $BASE.
Confirm an origin remote exists with git remote get-url origin.
Step 2: Fetch the Latest Base
Fetch only what is needed and prune stale refs:
bash
git fetch --prune origin "$BASE"
If the fetch fails (network/auth), report the exact error and stop. Do not start a rebase against stale refs.
Step 3: Start the Rebase
Run:
bash
git rebase "origin/$BASE"
Capture both stdout and stderr. There are three outcomes:
Outcome
How to Detect
Action
Clean rebase
Exit 0, no CONFLICT lines
Go to Step 5
Conflicts
Exit non-zero, output contains CONFLICT or could not apply
Go to Step 4
Other failure
Exit non-zero without conflict markers
Run git rebase --abort, restore any stash from Step 1, report error, stop
Step 4: Resolve Conflicts (Loop)
Repeat this loop until git status reports the rebase is no longer in progress.
4a. Inventory the Conflicts
Run git status --porcelain=v1. Conflicted files are marked UU, AA, DU, UD, AU, UA, or DD.
For each conflicted file:
Read the full file (do not rely on <<<<<<< markers alone for context)
Identify the conflict regions delimited by <<<<<<<, =======, >>>>>>>
Identify which side is "ours" (the rebased commit being replayed) and "theirs" (the base branch tip). During git rebase, "ours" is the upstream base and "theirs" is the commit being replayed — this is the opposite of git merge. Verify with git log --oneline -1 HEAD and git log --oneline -1 REBASE_HEAD if unsure.
If the rebase reports "No changes - did you forget to use 'git add'?", the commit became empty after resolution. Run git rebase --skip.
If new conflicts appear on the next commit, return to step 4a.
If at any point you are stuck (more than 2 attempts on the same file produce conflict markers, or the user asked to stop), run git rebase --abort, restore the stash, and report.
Step 5: Post-Rebase Validation
Once the rebase completes:
Confirm state: git status should show "nothing to commit, working tree clean" and the branch ahead of origin/$BASE.
If lockfiles or generated files were taken from base in Step 4, regenerate them now:
pnpm install if pnpm-lock.yaml was touched
cargo build (or cargo check) if Cargo.lock was touched
The project-appropriate codegen command for any generated sources
Stage and amend into the relevant commit only if regeneration produced changes; otherwise leave alone.
If a stash was created in Step 1, ask the user before popping it (git stash pop).
Step 6: Report
Tell the user:
The base branch and SHA you rebased onto (git rev-parse --short "origin/$BASE")
How many commits were replayed (git rev-list --count "origin/$BASE..HEAD")
Which files had conflicts and a one-line summary of how each was resolved
Any follow-up they should do (e.g., "lockfile regenerated, please verify"), and whether a force-push is required (git push --force-with-lease) — but do not push unless explicitly asked
Hard Rules
NEVER run git push --force (without --with-lease) on the user's behalf
NEVER push at all unless the user explicitly asks
NEVER run git rebase --skip to bypass conflicts you do not understand — only for genuinely empty commits
NEVER discard uncommitted work without explicit confirmation
NEVER resolve a conflict by deleting code from one side without reading both sides in full
Rebase next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
Rebase compared with similar skills
Skill
Stars
Used in
Tokens
Auto-check
Licence
Repo updated
Rebase this skilldeadlock-mod-manager/deadlock-mod-manager
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.
Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.
Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.
Fetch the latest default branch and rebase the current branch on top of it, resolving any merge conflicts automatically. Rebase is an agent skill from deadlock-mod-manager/deadlock-mod-manager. Fetch the latest default branch and rebase the current branch on top of it, resolving any merge conflicts automatically.
When should I use Rebase?
Rebase fits situations like: asked to rebase; update branch with main; rebase onto latest.
How do I install Rebase in Claude Code?
Run `npx skills add deadlock-mod-manager/deadlock-mod-manager --skill rebase -a claude-code`. Or copy the skill folder (.agents/skills/rebase in deadlock-mod-manager/deadlock-mod-manager) into .claude/skills/rebase in your project. Claude Code loads it when a task matches its description.
How do I install Rebase in Codex?
Run `npx skills add deadlock-mod-manager/deadlock-mod-manager --skill rebase -a codex`. Or copy the skill folder (.agents/skills/rebase in deadlock-mod-manager/deadlock-mod-manager) into .agents/skills/rebase in your project. Codex loads it when a task matches its description.
Can I use Rebase in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add deadlock-mod-manager/deadlock-mod-manager --skill rebase -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/rebase, .gemini/skills/rebase, .github/skills/rebase and .opencode/skills/rebase in your project.
What does Rebase need to run?
Going by SKILL.md and its folder, Rebase needs the command-line tools its instructions call (git, cargo, pnpm, gh and npm). Our summary lists: Node.js.
Does Rebase access the network?
SKILL.md contains no URLs. Its commands use git, gh and npm, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Rebase safe to install?
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
What licence does Rebase use?
Rebase is published under the GPL-3.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Rebase use?
About 1.9k tokens (SKILL.md is roughly 7.7k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Rebase?
Skills that share tags, products or a category with Rebase: Finishing a Development Branch (obra/superpowers, 296k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Rebase?
deadlock-mod-manager (a GitHub organization) maintains it in deadlock-mod-manager/deadlock-mod-manager, which has 473 GitHub stars. The repository holds 23 skills in this directory. The repository was last updated on October 6, 2026.
