agentleFS
Sign inStart free
lgtm-hqlgtm-hq/ai-skills/skills/rebase/SKILL.md

rebase

Skill1 starsChanged 10 days agoMITView on GitHub

Rebase the current branch onto the latest main. Use when asked to rebase, sync with main, update branch, or pull latest changes. Fetches and rebases onto latest main; does not push automatically.

  • Deletes or force-pushes
  • Commits and pushes

27 other projects use a version of this.

Adopted by

Most recently taken up by

Used with

Projects with it also use dependency-watch, perform-task and 9 more.

Other files people use alongside this one.

Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
  • telegramdesktopSkill

    dependency-watch

    Audit Telegram Desktop dependencies on freshly fetched origin/dev for releases and security fixes, including upstream lag and backport candidates in patched forks. Use for the scheduled dependency monitor or an explicitly requested dependency report.

    Also in 5 projects that use this

  • telegramdesktopSkill

    perform-task

    Resolve, start or resume, implement, review, test, and publish exactly one existing ai-tdesktop task by short slug or full dated id, including rare blocked retries and split-required results. Use when the user invokes $perform-task or /perform-task with a known task name, or when the continue scheduler delegates one selected task. Runs standard review lenses with fast applicability bailouts and selects task-specific domain and evidence instruments without selecting additional work.

    Also in 5 projects that use this

  • JerovinoSkill

    process-inbox

    Processes tasks.md inbox items by triaging each one to its proper location in the vault

    Also in 5 projects that use this

  • Trejon-888Skill

    continue

    Load project context, alignment audit, status check, suggest next action. Auto-invoke at session start, after context switches, or when user says 'continue', 'pick up where we left off', 'resume', 'what's next', 'status check', 'what now'.

    Also in 6 projects that use this

  • lepinkainenSkill

    code-health

    Analyze codebase health - large files, test coverage gaps, duplicate code, dead/legacy code, and documentation issues. Use when asked to scan, audit, or assess code quality, find refactoring targets, or identify technical debt.

    Also in 3 projects that use this

  • dekozaSkill

    fix-pr

    Repair an existing pull request's review findings and target-branch conflicts, verify the result, and update the same open PR.

    Also in 3 projects that use this

The file

Show its rules and text

We split this skill into the rules it gives an agent

15 rules. 0 are common, 12 are distinctive, and 3 are very specific to this project.

  • 0

    Common

    Most of the 27 edited versions we read keep these.

  • 12

    Distinctive

    This author's own choices. Worth a look.

  • 3

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  • could be automatic: a setting could enforce it
  1. Distinctive:

    When asked to rebase:

    line 12
  2. Distinctive:

    If on main, warn the user and stop — rebasing main onto itself is a no-op

    line 21
  3. Distinctive:

    If there are uncommitted changes, warn the user and stop — do NOT stash automatically

    line 22
  4. Distinctive:

    If the rebase succeeds cleanly, proceed to step 5

    line 38
  5. Distinctive:

    If there are conflicts:

    line 39
  6. Distinctive:

    Ask the user how they want to proceed: resolve manually, or abort

    line 41
  7. Distinctive:

    Do NOT force-continue or blindly resolve conflicts

    line 42
  8. Distinctive:

    Do NOT push automatically

    line 51
  9. Distinctive:

    If the user explicitly asks to push, use git push --force-with-lease

    line 52
  10. Very specific:

    NEVER use --force — always --force-with-lease for safety

    line 53
  11. Distinctive:

    NEVER rebase main itself

    line 57
  12. Very specific:

    NEVER use git push --force — always --force-with-lease

    line 58
  13. Distinctive:

    NEVER stash or discard uncommitted changes — warn and stop

    line 59
  14. Very specific:

    NEVER use --no-edit or -i flags with rebase

    line 60
  15. Distinctive:

    If conflicts occur, always involve the user — never auto-resolve

    line 61

“Common” is measured: kept by at least 6 in 10 of the 27 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Rebase

Rebase the current branch onto the latest origin/main.

Usage

When asked to rebase:

  1. Check current state:

    git status
git branch --show-current
    • If on main, warn the user and stop — rebasing main onto itself is a no-op
    • If there are uncommitted changes, warn the user and stop — do NOT stash automatically

  2. Fetch latest:

    git fetch origin

  3. Rebase onto main:

    git rebase origin/main
  4. Handle conflicts:
    • If the rebase succeeds cleanly, proceed to step 5
    • If there are conflicts:
      • List the conflicting files
      • Ask the user how they want to proceed: resolve manually, or abort
      • Do NOT force-continue or blindly resolve conflicts
      • To abort: git rebase --abort

  5. Confirm — Print a summary:

    Rebased feat/123-add-watch-mode onto origin/main
    • Do NOT push automatically
    • If the user explicitly asks to push, use git push --force-with-lease
    • NEVER use --force — always --force-with-lease for safety

Important

  • NEVER rebase main itself
  • NEVER use git push --force — always --force-with-lease
  • NEVER stash or discard uncommitted changes — warn and stop
  • NEVER use --no-edit or -i flags with rebase
  • If conflicts occur, always involve the user — never auto-resolve

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free