New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Rebase Origin Main

by ReviewStage in ReviewStage/stage-cli

A skill your agent uses when rebasing the current branch onto origin/main, including resolving merge conflicts along the way

MITAuto-check passedDevelopment

Install Rebase Origin Main

skills CLI
$ npx skills add ReviewStage/stage-cli --skill rebase-origin-main -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install ReviewStage/stage-cli rebase-origin-main --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/ReviewStage/stage-cli.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/rebase-origin-main .claude/skills/rebase-origin-main && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
rebase-origin-main
GitHub stars
274
Token cost
~927 tokens
SKILL.md length
456 words
Files
1
Skills in repo
10
Repo updated
First seen
Licence
MIT

At a glance

A skill your agent uses when rebasing the current branch onto origin/main, including resolving merge conflicts along the way

  • Works in 8 steps: Fetch & Start → Detect Conflicts → Resolve Each Conflicted File → …
  • Rebasing the current branch onto origin/main
  • SKILL.md covers Overview, Warning: Rebase Flips…, Workflow and Conflict Resolution Principles, plus 1 more section
  • Calls git and pnpm

What it does

Rebase Origin Main is an agent skill from ReviewStage/stage-cli. Use when rebasing the current branch onto origin/main, including resolving merge conflicts along the way

Its SKILL.md is about 930 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 viewer for reviewing local code changes in small individual chapters. Works with any AI agent. The licence is MIT.

When your agent uses it

  • Rebasing the current branch onto origin/main
  • Including resolving merge conflicts along the way

Example prompts

  • “/rebase-origin-main”

Workflow steps

8 steps, taken from the step headings in SKILL.md.

  1. Fetch & Start
  2. Detect Conflicts
  3. Resolve Each Conflicted File
  4. Continue
  5. Handle Edge Cases
  6. Verify
  7. Fix CI
  8. Push

What it can do on your machine

Read from SKILL.md and the folder at commit 59b977b. 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
    • pnpm

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git and pnpm, 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 Origin Main loads about 927 tokens when it runs. Until then it costs about 31 tokens; SKILL.md has 456 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~31
When it runs · the whole SKILL.md, loaded when a task matches
~927

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.

SKILL.md

The full file from ReviewStage/stage-cli at commit 59b977b, republished under its MIT licence (© ReviewStage). 456 words, ~927 tokens.

Download SKILL.mdSave it as .claude/skills/rebase-origin-main/SKILL.md (or your agent's skills folder).
name
rebase-origin-main
description
Use when rebasing the current branch onto origin/main, including resolving merge conflicts along the way
metadata.internal
true

Rebase with origin/main

Overview

Fetches the latest origin/main, rebases the current branch onto it, and resolves every conflict that arises — one commit at a time — until the rebase completes cleanly.

Warning: Rebase Flips ours/theirs

During a rebase, git's labels are inverted from what you expect:

LabelMeans
HEAD / ours (top of conflict)origin/main — the base being rebased onto
theirs (bottom of conflict)Your commit being replayed

Always resolve conflicts to preserve the intent of your commit while incorporating origin/main's context.

Workflow

1. Fetch & Start
bash
git fetch origin
git rebase origin/main

If the output says Successfully rebased — done. No conflicts.

2. Detect Conflicts
bash
git status

Look for lines with both modified, added by us, deleted by them, etc.

3. Resolve Each Conflicted File

For each conflicted file:

  1. Read the file — find all conflict markers (<<<<<<<, =======, >>>>>>>)
  2. Understand both sides:
    • Above ======= (HEAD) = origin/main's version
    • Below ======= = your commit's change
  3. Resolve by editing the file to the correct merged result — no conflict markers left
  4. Verify no conflict markers remain: grep -En "<<<<<<<|=======|>>>>>>>" <file>
  5. Stage the resolved file: git add <file>

If a conflict is ambiguous — where preserving both sides isn't clear — stop and ask the user before resolving.

4. Continue

After all conflicts in the current commit are staged:

bash
git rebase --continue

Git will either move to the next commit (go back to step 2) or report success.

5. Handle Edge Cases
SituationCommand
A commit becomes empty after resolutiongit rebase --skip
You need to abort entirelygit rebase --abort
Binary file conflictShow the user and ask which version to keep
6. Verify

After a clean rebase, confirm the branch looks correct:

bash
git log --oneline origin/main..HEAD
Show full SKILL.md (195 more words)Show less
7. Fix CI

After a successful rebase, run the full CI suite locally to catch any breakage introduced by the rebase:

bash
pnpm lint && pnpm typecheck && pnpm test && pnpm build

If anything fails, follow the fixing-ci skill workflow starting from Step 2 (Fix Loop) through Step 3 (Verify All): diagnose each failure, fix the root cause, verify, and commit atomically. Do not proceed to push until all checks pass locally — the push is handled by Step 8 below with --force-with-lease.

8. Push

Force-push with lease (safe force-push — aborts if someone else pushed since your last fetch):

bash
git push --force-with-lease

Conflict Resolution Principles

  • Prefer explicit over clever — when in doubt, keep both changes and adjust for correctness
  • Deletions on main win if you also deleted the same thing (skip your no-op)
  • Your additions win unless they conflict with a semantic change in main (e.g., a rename)
  • Never silently discard either side — if a resolution loses meaningful code, flag it to the user

Common Mistakes

MistakeFix
Leaving conflict markers in fileGrep for <<<<<<< before staging
Staging before fully reading the fileRead the full file first
Assuming ours = your branchIt's inverted in rebase — ours is origin/main
Continuing without reviewing logAlways run git log --oneline origin/main..HEAD after

© ReviewStage, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .agents/skills/rebase-origin-main of ReviewStage/stage-cli.

Open the folder on GitHubat commit 59b977b

Compare with similar skills

Rebase Origin Main 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 Origin Main compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Rebase Origin Main this skillReviewStage/stage-cli274—~927Automated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins11k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost56k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

  • Finishing a Development Branch

    obra/superpowers

    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.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Code Design Rationale Investigator

    cursor/plugins

    Official

    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.

    11k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed

  • Contributor-First PR Merge

    HKUDS/OpenHarness

    Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • Migrate Internal Package into Ghost

    TryGhost/Ghost

    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.

    56k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed

  • Create Pull Request

    cline/cline

    Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • Git Merge Conflict Resolver

    tailcallhq/forgecode

    Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from ReviewStage/stage-cli

All 10 skills in this repo

  • Fixing CI

    ReviewStage/stage-cli

    A skill your agent uses when CI is failing on a branch and you need to diagnose failures from GitHub, fix them locally with iterative verification, and re-push clean commits.

    274 GitHub stars~977 tokensUpdated 1 mo ago
    Auto-check passed

  • Fixing PR Comments

    ReviewStage/stage-cli

    A skill your agent uses when a pull request has unresolved review comments that need to be addressed, or when asked to fix PR feedback

    274 GitHub stars~953 tokensUpdated 1 mo ago
    Auto-check passed

  • Iterate PR

    ReviewStage/stage-cli

    A skill your agent uses when a PR is open and the user wants to autonomously monitor and fix PR review comments, CI failures, and rebase conflicts on a recurring loop, or when asked to…

    274 GitHub stars~1.1k tokensUpdated 1 mo ago
    Auto-check passed

  • Linear Issue

    ReviewStage/stage-cli

    A skill your agent uses when creating a Linear issue from the current coding context, or when the user invokes /linear-issue.

    274 GitHub stars~2k tokensUpdated 1 mo ago
    Auto-check passed

  • Quality Review

    ReviewStage/stage-cli

    A skill your agent uses when reviewing code changes against AGENTS.md implementation quality standards, or when asked to do an implementation quality review

    274 GitHub stars~1.3k tokensUpdated 1 mo ago
    Auto-check passed

  • Trade Off

    ReviewStage/stage-cli

    Use at any stage — planning, before implementing, or reviewing code that's already written — to surface high-level trade-offs that could significantly simplify the work.

    274 GitHub stars~3k tokensUpdated 1 mo ago
    Auto-check passed

Works with

Categories

Questions about Rebase Origin Main

What does Rebase Origin Main do?

A skill your agent uses when rebasing the current branch onto origin/main, including resolving merge conflicts along the way. Rebase Origin Main is an agent skill from ReviewStage/stage-cli.

When should I use Rebase Origin Main?

Rebase Origin Main fits situations like: rebasing the current branch onto origin/main; including resolving merge conflicts along the way.

How do I install Rebase Origin Main in Claude Code?

Run `npx skills add ReviewStage/stage-cli --skill rebase-origin-main -a claude-code`. Or copy the skill folder (.agents/skills/rebase-origin-main in ReviewStage/stage-cli) into .claude/skills/rebase-origin-main in your project. Claude Code loads it when a task matches its description.

How do I install Rebase Origin Main in Codex?

Run `npx skills add ReviewStage/stage-cli --skill rebase-origin-main -a codex`. Or copy the skill folder (.agents/skills/rebase-origin-main in ReviewStage/stage-cli) into .agents/skills/rebase-origin-main in your project. Codex loads it when a task matches its description.

Can I use Rebase Origin Main 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 ReviewStage/stage-cli --skill rebase-origin-main -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-origin-main, .gemini/skills/rebase-origin-main, .github/skills/rebase-origin-main and .opencode/skills/rebase-origin-main in your project.

What does Rebase Origin Main need to run?

Going by SKILL.md and its folder, Rebase Origin Main needs the command-line tools its instructions call (git and pnpm).

Does Rebase Origin Main access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Rebase Origin Main 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 Origin Main use?

Rebase Origin Main is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Rebase Origin Main use?

About 927 tokens (SKILL.md is roughly 3.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 Origin Main?

Skills that share tags, products or a category with Rebase Origin Main: Finishing a Development Branch (obra/superpowers, 297k stars), Code Design Rationale Investigator (cursor/plugins, 11k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Rebase Origin Main?

ReviewStage (a GitHub organization) maintains it in ReviewStage/stage-cli, which has 274 GitHub stars. The repository holds 10 skills in this directory. The repository was last updated on September 7, 2026.

Source: ReviewStage/stage-cli on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.