agentleFS
Sign inStart free
stormlightlabsstormlightlabs/mire/.claude/skills/resync/SKILL.md

resync

Skill1 starsChanged 18 days agoApache-2.0View on GitHub

Rebase an open pull request onto the current main, run the gates and push. Use for /resync, or when a pull request has a conflict or its base has moved under it.

  • Deletes or force-pushes
  • Commits and pushes

1 other project uses a version of this.

Adopted by

Most recently taken up by

  • Other versions1 project uses a version of this.

    Word for word · 0

    None found.

    Edited · 0

    None found.

    Wrote their own version · 1

    1. pietz/skills★ 2same name

    How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.

  • In this repository9 other files it gives its agents.

The file

We split this skill into the rules it gives an agent

4 rules. About 0 are common, 0 are distinctive, and 4 are very specific to this project.

  • ≈0

    Common · estimate

    Many files like this have a rule of this kind.

  • ≈0

    Distinctive · estimate

    This author's own choices. Worth a look.

  • 4

    Very specific

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

  • Common
  • Distinctive
  • Very specific
  1. Very specific:

    Use the worktree git worktree list shows on the pull request's branch, or take one as the revise skill does.

    line 25
  2. Very specific:

    Run the gates (the command gates names in .github/fabrial.toml).

    line 50
  3. Very specific:

    When only the base moved, the Review gate keeps storm/review green.

    line 58
  4. Very specific:

    If it stays pending after a push that only moved the base, the previous head's check was not yet green when the gate read it: wait for that …

    line 60

≈ “Common” is an estimate: at least 1 in 5 of the 350,495 skill files we read have a rule of the same kind, not the same words. “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

Resync

Move one pull request onto the current head of main.

Read the pull request

gh pr view <n> --json headRefName,baseRefName,headRefOid,author

A cloud session reads the same with pull_request_read method get. Note the head before the rebase.

The branch must be an agent's: claude/, codex/ or storm/. Rebasing rewrites it, so leave a person's branch alone and report instead.

Work in the pull request's tree

Use the worktree git worktree list shows on the pull request's branch, or take one as the revise skill does. Never rebase in the user's primary checkout.

Rebase

git fetch origin main <branch>
git diff "$(git merge-base origin/main HEAD)" HEAD > before.diff
git rebase origin/main
git diff origin/main HEAD > after.diff

Compare the two diffs as the Review gate does: the same changed lines with the same surrounding context, wherever they sit in the file. Line numbers in the @@ headers and the blob ids on index lines may differ; any other difference, whitespace included, means the change itself differs, as when main already held part of it or changed a line next to it.

A conflict is a decision about the change. Abort with git rebase --abort, name the conflicting files, and stop: a revise pass, a storm run's Finish step or the operator resolves it.

Verify and push

Run the gates (the command gates names in .github/fabrial.toml). A gate that fails after the rebase is a finding for a revise pass: report it and push nothing.

git push --force-with-lease origin <branch>

When only the base moved, the Review gate keeps storm/review green. Otherwise the check goes back to pending and the change needs /storm:review. If it stays pending after a push that only moved the base, the previous head's check was not yet green when the gate read it: wait for that check, then rerun this push's Review gate run, or ask for /storm:review.

Report

Report the pull request, the old and new heads, whether the change is the same or differs, and the gates and their result. A stop names its reason and the files.

Do not

  • Resolve a conflict yourself.
  • Rebase a branch a person owns.
  • Merge, approve, or push to main.

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