rebase-latest-main

rebase-latest-main is a skill for Claude Code, Codex from dyoshikawa/rulesync. It costs 47 tokens per session (540 once invoked), scanned A, original, MIT.

A procedure for fetching the newest remote main branch and replaying the current branch's commits on top of it. Rebasing updates a branch's starting point while keeping its changes in a linear history.

In plain words
What is it for?
It is for syncing a working branch with origin/main, resolving merge conflicts during the rebase, and checking that the updated branch is ready to continue.
Why use it?
It helps bring a feature branch up to date and requires conflicts or uncommitted work to be handled before the branch is changed.

Skill for Claude CodeCodex

About the project

Rulesync is a command-line tool that generates configuration for different AI development tools from a shared set of rules. Developers use it to keep instructions, commands, MCP settings, ignore files, subagents, and skills consistent across coding agents. Catalogue skills support workflows built around Rulesync.

dyoshikawa/rulesync · 1,385 stars · on GitHub

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/dyoshikawa/rulesync/rebase-latest-main
Any agent
npx skills add dyoshikawa/rulesync --skill rebase-latest-main
Clone the repo
git clone --depth 1 https://github.com/dyoshikawa/rulesync

Made for: Claude Code, Codex.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for rebase-latest-main

README.md
[![agentmods](https://agentmods.dev/badge/skills/dyoshikawa/rulesync/rebase-latest-main.svg)](https://agentmods.dev/skills/dyoshikawa/rulesync/rebase-latest-main)
Your own site
<a href="https://agentmods.dev/skills/dyoshikawa/rulesync/rebase-latest-main"><img src="https://agentmods.dev/badge/skills/dyoshikawa/rulesync/rebase-latest-main.svg" alt="Measured on agentmods" height="20"></a>
Per session 47 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 540 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00047 $0.00540
Opus 5 $0.00023 $0.00270
Sonnet 5 $0.00009 $0.00108
Haiku 4.5 $0.00005 $0.00054

Measured 5d ago against content hash dc8385ddb725, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

rebase-latest-main scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 5d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.rulesync/skills/rebase-latest-main/SKILL.md · 106 lines

What it actually says

Rebase Latest Main

Fetch the latest origin/main and rebase it onto the current working branch.

Step 1: Verify Current State

  1. Check the current branch:

    git branch --show-current
    
  2. Ensure there are no uncommitted changes:

    git status --porcelain
    

    If there are uncommitted changes, either:

    • Commit them first, or
    • Ask the user how to proceed (commit, stash, or abort)

Step 2: Fetch Latest Changes

Fetch the latest changes from the remote:

git fetch origin main

Step 3: Rebase onto origin/main

Start the rebase:

git rebase origin/main

If rebase succeeds without conflicts:

Proceed to Step 5.

If conflicts occur:

  1. Identify conflicting files:

    git diff --name-only --diff-filter=U
    
  2. For each conflicting file:

    • Read the file content to understand the conflict
    • Analyze both versions (HEAD and origin/main)
    • Resolve the conflict by choosing the appropriate changes or merging them
    • Stage the resolved file:
      git add <resolved-file>
      
  3. Continue the rebase:

    git rebase --continue
    
  4. Repeat until all conflicts are resolved and rebase is complete.

Step 4: Handle Rebase Failure

If unable to resolve conflicts automatically:

  • Show the conflicting files and conflict markers to the user
  • Ask for guidance on how to resolve
  • If the user wants to abort:
    git rebase --abort
    

Step 5: Push Changes

After successful rebase, force push to update the remote branch:

git push --force-with-lease

Note: --force-with-lease is safer than --force as it prevents overwriting others' work.

Step 6: Report Result

Summarize the operation:

  1. Number of commits rebased
  2. Any conflicts that were resolved
  3. Confirmation that the branch is now up-to-date with origin/main
Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 5d ago First seen · 106 lines · 47 tokens per session scan A dc8385ddb725

Subscribe to this mod's changes

rebase-latest-main is a skill published in the GitHub repository dyoshikawa/rulesync (1,385 stars, last pushed today), licensed MIT. It adds 47 tokens to every session and 540 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Related

Other skills, from other repositories

snip

You are an expert at writing declarative YAML filters for snip, a CLI proxy that reduces LLM token consumption by filtering shell output.

edouard-claude/snip · 0 tokens

opensrc

Fetch dependency source code to give AI agents deeper implementation context. Use when the agent needs to understand how a library works internally, read source code for a package, fetch implementation details for a dependency, or explore how an npm/PyPI/crates.io package is built. Triggers include "fetch source for"…

vercel-labs/opensrc · 103 tokens

building-agents

Use when building or restructuring an LLM agent — provider adapter, tool calling, structured output, RAG, agent loop, eval gate, cost routing, tracing, MCP server — model-agnostic across OpenAI/Anthropic/Gemini/OSS so a model swap is a config change. NOT vector-store SQL alone (that is postgresdb) or service…

ericrisco/rsc-harness · 85 tokens

agent-eval

Use when measuring whether an LLM or agent system actually got better and gating merges on it: golden sets, fixing an inflated LLM-as-judge, scoring RAG (faithfulness, contextual recall) or agent trajectories (tool correctness, completion), or picking an eval framework. NOT building the agent loop, tools or RAG…

ericrisco/rsc-harness · 79 tokens

prompt-engineering

Use when one prompt must give the same right answer across reruns, models, and pasted-in hostile input: forcing a fixed schema, picking the few-shot set, ordering the prompt blocks, or the inline cases you run while tuning. NOT the agent loop, tools, or retrieval (that is building-agents), NOT a standing CI eval…

ericrisco/rsc-harness · 83 tokens

linked-intent-dev

Guide for linked-intent development (LID). Consult for ALL code changes. Walks changes through a mode-aware six-phase workflow (HLD → LLD → EARS → intent-narrowing edge audit → tests-first → code) with mandatory stops between each phase. Bugs walk the arrow like any other change — no short-circuit. Enforces cascade…

jszmajda/lid · 87 tokens