Agent skill

Rebase Main

by hyochan in hyochan/flutter_calendar_carousel

Safely update local main from origin/main, rebase the current fluttercalendarcarousel work branch, resolve conflicts without losing staged, unstaged, untracked, ignored, or generated work, and…

MITAuto-check passedMobile

Install Rebase Main

skills CLI
$ npx skills add hyochan/flutter_calendar_carousel --skill rebase-main -a claude-code

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

GitHub CLI
$ gh skill install hyochan/flutter_calendar_carousel rebase-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/hyochan/flutter_calendar_carousel.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.codex/skills/rebase-main .claude/skills/rebase-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-main
GitHub stars
860
Token cost
~662 tokens
SKILL.md length
327 words
Files
2
Skills in repo
7
Repo updated
First seen
Licence
MIT

At a glance

Safely update local main from origin/main, rebase the current fluttercalendarcarousel work branch, resolve conflicts without losing staged, unstaged, untracked, ignored, or generated work, and…

  • Works in 5 steps: Read AGENTS.md. → Record branch, HEAD, upstream,… → Stop if detached, currently on main,… → …
  • Asked to pull main
  • SKILL.md covers Establish And Safeguard, Update And Rebase and Restore And Verify
  • Calls git

What it does

Rebase Main is an agent skill from hyochan/flutter_calendar_carousel. Safely update local main from origin/main, rebase the current fluttercalendarcarousel work branch, resolve conflicts without losing staged, unstaged, untracked, ignored, or generated work, and restore the original working-tree state. Use when asked to pull main, rebase onto main, update a branch, or fix a stuck rebase.

Its SKILL.md is about 660 tokens, which your agent loads only when the skill is triggered. The skill folder holds 2 other files (for example `agents/openai.yaml`).

It sits in Mobile, covering Cross-platform mobile apps and Git workflow. It works with Flutter and Git. The repository describes itself as: Calendar widget for flutter that is swipeable horizontally. This widget can help you build your own calendar widget highly customizable. The licence is MIT.

When your agent uses it

  • Asked to pull main
  • Rebase onto main
  • Update a branch
  • Fix a stuck rebase

Example prompts

  • “/rebase-main”

Workflow steps

5 steps, taken from the first numbered list in SKILL.md.

  1. Read AGENTS.md.
  2. Record branch, HEAD, upstream, worktrees, in-progress Git operations, staged,
  3. Stop if detached, currently on main, another operation is active, or main
  4. Default to origin/main; derive another target only from repository evidence.
  5. If dirty, create one named stash with --include-untracked, never --all.

What it can do on your machine

Read from SKILL.md and the folder at commit 36f6b51. 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 Main loads about 662 tokens when it runs. Until then it costs about 84 tokens; SKILL.md has 327 words of instructions outside code blocks.

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

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 hyochan/flutter_calendar_carousel at commit 36f6b51, republished under its MIT licence (© hyochan). 327 words, ~662 tokens.

Download SKILL.mdSave it as .claude/skills/rebase-main/SKILL.md (or your agent's skills folder). This skill also uses 1 other file; get the full folder from GitHub.
name
rebase-main
description
Safely update local main from origin/main, rebase the current flutter_calendar_carousel work branch, resolve conflicts without losing staged, unstaged, untracked, ignored, or generated work, and restore the original working-tree state. Use when asked to pull main, rebase onto main, update a branch, or fix a stuck rebase.

Rebase Main

Update main, rebase the current work branch, and preserve all local work. Do not commit or push unless separately authorized.

Establish And Safeguard

  1. Read AGENTS.md.
  2. Record branch, HEAD, upstream, worktrees, in-progress Git operations, staged, unstaged, untracked, and relevant ignored files with content fingerprints.
  3. Stop if detached, currently on main, another operation is active, or main is checked out elsewhere and cannot be updated safely.
  4. Default to origin/main; derive another target only from repository evidence.
  5. If dirty, create one named stash with --include-untracked, never --all. Confirm the tracked and untracked worktree is clean. Preserve ignored secrets and environment files in place.

The stash is a recovery point. Do not drop it until restoration is exact.

Update And Rebase

  1. Fetch origin main.
  2. Before switching, verify no recorded ignored/local path collides with a path tracked by the destination. Use git checkout --no-overwrite-ignore for guarded transitions.
  3. Check out main and run git merge --ff-only origin/main. Stop on divergence; never reset or create a merge commit to conceal it.
  4. Confirm local main and origin/main are identical.
  5. Check out the recorded work branch with the same collision guard.
  6. Run git rebase origin/main.
  7. Resolve each conflict by inspecting base, new-main, and work-branch intent. Preserve compatible changes and regenerate derived files through their tools. Never apply blanket ours/theirs resolution.

Never use git reset --hard, git checkout --, git clean, or destructive recovery shortcuts.

Restore And Verify

  1. Apply the named stash with its index.
  2. Resolve restoration conflicts carefully. Keep the stash while any mismatch remains.
  3. Compare staged, unstaged, untracked, and ignored fingerprints to the initial snapshot.
  4. Drop only the named stash after exact restoration.
  5. Run git status, git diff --check, and affected lightweight checks.
  6. Report old/new main and branch heads plus restored working-tree state.

If the work branch was published, explain that rewritten history needs a later git push --force-with-lease; do not perform it without explicit authorization.

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

Files

SKILL.md and 1 other file in .codex/skills/rebase-main of hyochan/flutter_calendar_carousel.

  • SKILL.md
  • agents/openai.yaml

Open the folder on GitHubat commit 36f6b51

Compare with similar skills

Rebase 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 Main compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Rebase Main this skillhyochan/flutter_calendar_carousel860—~662Automated safety check: PassMIT
Frb Add Contributorfzyzcjy/flutter_rust_bridge5.4k—~1.6kAutomated safety check: PassMIT
Flutter Appccplugins/awesome-claude-code-plugins970—~1.1kAutomated safety check: NotesApache-2.0
Core API Changelibnativeapi/nativeapi164—~2.5kAutomated safety check: PassMIT
Rebase Mainhyochan/react-native-nitro-sound961—~702Automated safety check: PassMIT
Ad NextCorridorTech/PoseCap224—~3.3kAutomated safety check: NotesApache-2.0

Similar skills

  • Frb Add Contributor

    fzyzcjy/flutter_rust_bridge

    Add or reconcile flutterrustbridge contributors through all-contributors PRs.

    5.4k GitHub stars~1.6k tokensUpdated today
    MobileAuto-check passed
  • Flutter App

    ccplugins/awesome-claude-code-plugins

    Bootstrap a new Flutter mobile app with clean architecture, Riverpod, FVM-pinned SDK, current packages, and no deprecated APIs.

    970 GitHub stars~1.1k tokensUpdated 1 mo ago
    MobileAuto-check: notes
  • Core API Change

    libnativeapi/nativeapi

    Carry a change to the C++ public API in core/ all the way downstream — design check, header edit, six platform implementations, C ABI + Rust/Dart/C/JS/Python regeneration, per-binding verification…

    164 GitHub stars~2.5k tokensUpdated today
    MobileAuto-check passed
  • Rebase Main

    hyochan/react-native-nitro-sound

    Safely update local main from origin/main, rebase the current react-native-nitro-sound work branch, resolve conflicts without losing staged, unstaged, untracked, ignored, or generated work, and…

    961 GitHub stars~702 tokensUpdated 10 days ago
    MobileAuto-check passed
  • Ad Next

    CorridorTech/PoseCap

    Survey the project's state across the six-layer artifact stack and recommend prioritized next actions, modeled on flutter doctor.

    224 GitHub stars~3.3k tokensUpdated 3 days ago
    MobileAuto-check: notes
  • Frb Fix Merge Conflict

    fzyzcjy/flutter_rust_bridge

    A skill your agent uses when resolving merge or rebase conflicts in flutterrustbridge, especially conflicts involving generated files after master/main changed independently from a PR branch.

    5.4k GitHub stars~1.2k tokensUpdated today
    DevelopmentAuto-check passed

More from hyochan/flutter_calendar_carousel

  • Review PR

    hyochan/flutter_calendar_carousel

    Inspect and finish fluttercalendarcarousel pull requests by fixing valid review findings, replying and resolving threads, diagnosing CI, using review-self when automation is unavailable, and polling…

    860 GitHub stars~1.4k tokensUpdated 18 days ago
    Auto-check passed
  • Flutter Calendar Carousel Workflows

    hyochan/flutter_calendar_carousel

    A skill your agent uses for fluttercalendarcarousel repository work that should follow its shared workflows for issue resolution, dependency and Flutter upgrades, full verification, commits, pushes…

    860 GitHub stars~757 tokensUpdated 18 days ago
    Auto-check passed
  • Review Self

    hyochan/flutter_calendar_carousel

    Independently review and improve the current fluttercalendarcarousel implementation, working-tree changes, commit range, or pull request; fix actionable in-scope gaps; rerun relevant verification…

    860 GitHub stars~999 tokensUpdated 18 days ago
    Auto-check passed
  • Flutter Calendar Carousel Workflows

    hyochan/flutter_calendar_carousel

    A skill your agent uses for fluttercalendarcarousel repository work that should follow its shared workflows for issue resolution, dependency and Flutter upgrades, verification, commits, pull…

    860 GitHub stars~203 tokensUpdated 18 days ago
    Auto-check passed
  • Review PR

    hyochan/flutter_calendar_carousel

    Inspect and finish fluttercalendarcarousel pull requests by fixing valid review findings, resolving threads, diagnosing CI, and polling every five minutes until the exact head is clean.

    860 GitHub stars~172 tokensUpdated 18 days ago
    Auto-check passed
  • Review Self

    hyochan/flutter_calendar_carousel

    Independently review and improve current fluttercalendarcarousel work, fix actionable gaps, rerun verification, and recheck every five minutes until stable.

    860 GitHub stars~160 tokensUpdated 18 days ago
    Auto-check passed

Works with

Categories

Questions about Rebase Main

What does Rebase Main do?

Safely update local main from origin/main, rebase the current fluttercalendarcarousel work branch, resolve conflicts without losing staged, unstaged, untracked, ignored, or generated work, and…. Rebase Main is an agent skill from hyochan/flutter_calendar_carousel. Safely update local main from origin/main, rebase the current fluttercalendarcarousel work branch, resolve conflicts without losing staged, unstaged, untracked, ignored, or generated work, and restore the original working-tree state.

When should I use Rebase Main?

Rebase Main fits situations like: asked to pull main; rebase onto main; update a branch; fix a stuck rebase.

How do I install Rebase Main in Claude Code?

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

How do I install Rebase Main in Codex?

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

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

What does Rebase Main need to run?

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

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

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

About 662 tokens (SKILL.md is roughly 2.6k 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 Main?

Skills that share tags, products or a category with Rebase Main: Frb Add Contributor (fzyzcjy/flutter_rust_bridge, 5.4k stars), Flutter App (ccplugins/awesome-claude-code-plugins, 970 stars), Core API Change (libnativeapi/nativeapi, 164 stars) and Rebase Main (hyochan/react-native-nitro-sound, 961 stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Rebase Main?

hyochan (a GitHub user) maintains it in hyochan/flutter_calendar_carousel, which has 860 GitHub stars. The repository holds 7 skills in this directory. The repository was last updated on September 21, 2026.

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