agentsclimarketplace

Rebase onto main

Skill IcodeNet/agent-skills/skills/rebase-onto-main

40 portable full-SDLC agent skills for Claude Code, Cursor, Codex, and GitHub Copilot — deep-work autonomy, contract-guard for external interfaces, TDD, code review, PR babysitting. Install: npx github:IcodeNet/agent-skills

Install
npx -y skills add IcodeNet/agent-skills --skill rebase-onto-main

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

2 things to look at

  • 28 days oldThe repository was created 28 days ago. New is not bad, but a brand new repository carrying a familiar-sounding name is the shape a typosquat arrives in, and there has been no time for anyone else to find a problem with it.
  • 0 stars0 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its author says it does

Copied from the file, not written here

Rebase the current branch onto main with guardrails. Manual command — run with /rebase-onto-main when the user asks to rebase the current branch on main.

SKILL.md

1.2 KB, 254 tokens by cl100k_base, as published. Nobody here has run it

Rebase Onto Main

Rebase the current branch onto the latest main safely.

  1. Branch + cleanliness checks

    • Run git branch --show-current; abort if on main/master.
    • Run git status --short.
    • If the working tree is dirty, stop and ask whether to commit or stash first.

  2. Fetch latest main

    • Run git fetch origin main.
    • If the default branch isn't main, detect it (git remote show origin) and use that instead throughout.

  3. Rebase

    • Run git rebase origin/main.

  4. Conflict handling (mandatory)

    • If a conflict occurs:
      • Run git status --short and report conflicted files.
      • Stop and ask the user whether to continue resolving, abort (git rebase --abort), or take a narrower scope.

  5. Post-rebase verification

    • Run git status.
    • Run git log --oneline -5 for a quick verification summary.
    • If the branch was previously pushed, note that the next push requires --force-with-lease — never plain --force.

What ships with it

Read from the repository

Just SKILL.md. No reference files, no scripts.

Keep looking

Skills are one crate of 327,132. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.