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 Latest Main

by dyoshikawa in dyoshikawa/rulesync

Fetch latest origin/main and rebase it onto the current branch, resolving conflicts if necessary.

MITAuto-check passedDevelopment

Install Rebase Latest Main

skills CLI
$ npx skills add dyoshikawa/rulesync --skill rebase-latest-main -a claude-code

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

GitHub CLI
$ gh skill install dyoshikawa/rulesync rebase-latest-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/dyoshikawa/rulesync.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.rulesync/skills/rebase-latest-main .claude/skills/rebase-latest-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-latest-main
GitHub stars
1.5k
Token cost
~545 tokens
SKILL.md length
229 words
Files
1
Skills in repo
40
Repo updated
First seen
Licence
MIT

At a glance

Fetch latest origin/main and rebase it onto the current branch, resolving conflicts if necessary.

  • Works in 6 steps: Verify Current State → Fetch Latest Changes → Rebase onto origin/main → …
  • The user wants to rebase on main
  • SKILL.md covers Step 1: Verify Current State, Step 2: Fetch Latest Changes, Step 3: Rebase onto origin/main and Step 4: Handle Rebase Failure, plus 2 more sections
  • Calls git

What it does

Rebase Latest Main is an agent skill from dyoshikawa/rulesync. Fetch latest origin/main and rebase it onto the current branch, resolving conflicts if necessary. Use when the user wants to rebase on main, update their branch with latest main, or sync with upstream.

Its SKILL.md is about 550 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. The repository describes itself as: A Utility CLI for AI Coding Agents. The licence is MIT.

When your agent uses it

  • The user wants to rebase on main
  • Update their branch with latest main
  • Sync with upstream

Example prompts

  • “/rebase-latest-main”

Workflow steps

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

  1. Verify Current State
  2. Fetch Latest Changes
  3. Rebase onto origin/main
  4. Handle Rebase Failure
  5. Push Changes
  6. Report Result

What it can do on your machine

Read from SKILL.md and the folder at commit b9e40d7. 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

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

  • Network

    No URLs in SKILL.md. Its commands use git, 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 Latest Main loads about 545 tokens when it runs. Until then it costs about 55 tokens; SKILL.md has 229 words of instructions outside code blocks.

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

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 dyoshikawa/rulesync at commit b9e40d7, republished under its MIT licence (© dyoshikawa). 229 words, ~545 tokens.

Download SKILL.mdSave it as .claude/skills/rebase-latest-main/SKILL.md (or your agent's skills folder).
name
rebase-latest-main
description
Fetch latest origin/main and rebase it onto the current branch, resolving conflicts if necessary. Use when the user wants to rebase on main, update their branch with latest main, or sync with upstream.
targets
*

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:

    bash
    git branch --show-current

  2. Ensure there are no uncommitted changes:

    bash
    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:

bash
git fetch origin main

Step 3: Rebase onto origin/main

Start the rebase:

bash
git rebase origin/main
If rebase succeeds without conflicts:

Proceed to Step 5.

If conflicts occur:

  1. Identify conflicting files:

    bash
    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:
      bash
      git add <resolved-file>

  3. Continue the rebase:

    bash
    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:
    bash
    git rebase --abort

Step 5: Push Changes

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

bash
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

© dyoshikawa, 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 .rulesync/skills/rebase-latest-main of dyoshikawa/rulesync.

Open the folder on GitHubat commit b9e40d7

Compare with similar skills

Rebase Latest 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 Latest Main compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Rebase Latest Main this skilldyoshikawa/rulesync1.5k—~545Automated safety check: PassMIT
Vercel Composition Patternssupabase/supabase111k58 repos~726Automated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Typescript Advanced Typesrolling-scopes/rsschool-app10k25 repos~4.2kAutomated safety check: PassMPL-2.0
PR Babysitteropeninterpreter/openinterpreter69k3 repos~4.2kAutomated safety check: PassApache-2.0
Code Review ChecklistshareAI-lab/learn-claude-code78k4 repos~1.1kAutomated safety check: PassMIT

Similar skills

  • Vercel Composition Patterns

    supabase/supabase

    Official

    React composition patterns that scale. An agent skill from supabase/supabase.

    111k GitHub starsUsed in 58 repos~726 tokens
    DevelopmentAuto-check passed

  • 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

  • Typescript Advanced Types

    rolling-scopes/rsschool-app

    Master TypeScript's advanced type system including generics, conditional types, mapped types, template literals, and utility types for building type-safe applications.

    10k GitHub starsUsed in 25 repos~4.2k tokens
    DevelopmentAuto-check passed

  • PR Babysitter

    openinterpreter/openinterpreter

    Watches an open GitHub pull request until it merges, handling review comments, diagnosing CI failures and retrying flaky checks along the way.

    69k GitHub starsUsed in 3 repos~4.2k tokens
    DevelopmentAuto-check passed

  • Code Review Checklist

    shareAI-lab/learn-claude-code

    Reviews code against a five-part checklist covering security, correctness, performance, maintainability and testing, and reports findings in a fixed format.

    78k GitHub starsUsed in 4 repos~1.1k tokens
    DevelopmentAuto-check passed

  • Greploop

    onyx-dot-app/onyx

    Iteratively improves a PR (GitHub), MR (GitLab), or shelved changelist (Perforce) until Greptile gives it a 5/5 confidence score with zero unresolved comments.

    32k GitHub starsUsed in 4 repos~3.3k tokens
    DevelopmentAuto-check passed

More from dyoshikawa/rulesync

All 40 skills in this repo

  • Rulesync Feature Research

    dyoshikawa/rulesync

    Maps rulesync feature implementations to upstream coding-agent documentation.

    1.5k GitHub stars~1.8k tokensUpdated today
    Auto-check passed

  • Babysit Dependabot PR

    dyoshikawa/rulesync

    Babysit a Dependabot dependency-bump PR all the way to merge: verify the author is the genuine Dependabot bot, diagnose and resolve any CI failure (excluding or fixing a breaking bump when needed)…

    1.5k GitHub stars~1.3k tokensUpdated today
    Auto-check passed

  • Commit Push PR

    dyoshikawa/rulesync

    Commit current changes, push to remote, and create or update a pull request.

    1.5k GitHub stars~458 tokensUpdated today
    Auto-check passed

  • Git Worktree Runner

    dyoshikawa/rulesync

    Manages git worktrees using git-worktree-runner (gtr). An agent skill from dyoshikawa/rulesync.

    1.5k GitHub stars~1.3k tokensUpdated today
    Auto-check: notes

  • Goal PR

    dyoshikawa/rulesync

    Drive a pull request to a clean state and merge it: run the review-pr skill, fix every mid-or-above finding, and repeat until no mid-or-above findings remain, then merge.

    1.5k GitHub stars~1.4k tokensUpdated today
    Auto-check passed

  • Goal Release

    dyoshikawa/rulesync

    Cut a release end to end: use the draft-release skill to open the release PR and draft GitHub release, wait for CI to turn green, run the merge-pr skill to merge the release PR, then update the…

    1.5k GitHub stars~2k tokensUpdated today
    Auto-check passed

Categories

Questions about Rebase Latest Main

What does Rebase Latest Main do?

Fetch latest origin/main and rebase it onto the current branch, resolving conflicts if necessary. Rebase Latest Main is an agent skill from dyoshikawa/rulesync. Fetch latest origin/main and rebase it onto the current branch, resolving conflicts if necessary.

When should I use Rebase Latest Main?

Rebase Latest Main fits situations like: the user wants to rebase on main; update their branch with latest main; sync with upstream.

How do I install Rebase Latest Main in Claude Code?

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

How do I install Rebase Latest Main in Codex?

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

Can I use Rebase Latest 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 dyoshikawa/rulesync --skill rebase-latest-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-latest-main, .gemini/skills/rebase-latest-main, .github/skills/rebase-latest-main and .opencode/skills/rebase-latest-main in your project.

What does Rebase Latest Main need to run?

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

Does Rebase Latest 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 Latest 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 Latest Main use?

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

About 545 tokens (SKILL.md is roughly 2.2k 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 Latest Main?

Skills that share tags, products or a category with Rebase Latest Main: Vercel Composition Patterns (supabase/supabase, 111k stars), Finishing a Development Branch (obra/superpowers, 297k stars), Typescript Advanced Types (rolling-scopes/rsschool-app, 10k stars) and PR Babysitter (openinterpreter/openinterpreter, 69k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Rebase Latest Main?

dyoshikawa (a GitHub user) maintains it in dyoshikawa/rulesync, which has 1,511 GitHub stars. The repository holds 40 skills in this directory. The repository was last updated on October 11, 2026.

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