Compare upstream (mattpocock/skills) with this fork, recommend what to do, and, on an explicit go, merge it in as a PR that leaves every fork-only change standing.
Repo-local by design: it lives in .claude/skills/, outside skills/, so neither scripts/link-skills.sh nor a consumer's skills update distributes it. Keep it here.
Steps 1–3 are read-only. Nothing merges before a clear yes.
Steps
Report. Run bash .claude/skills/check-upstream/scripts/report.sh. It prints refs, upstream commits since the fork point, the files upstream changed, the files upstream deleted that this fork still carries, release state, fork-only paths, and a merge preview naming every file that will conflict. Done when you have its output. up to date → report that and stop.
Recommend. Read the diff behind each commit the report lists (git show <sha>); subject lines hide what actually changed. Give every one a verdict:
- take: wanted, lands on paths the fork left alone.
- collides: touches a file this fork has edited; name the fork behaviour at risk.
- irrelevant: touches only paths this fork does not carry.
Then split them on the release boundary the report prints: commits at or below the last version bump are released; the tail above it ships in the next version. Land on one recommendation (merge now, wait for the release, or merge with named edits) and give the reason in a line.
Done when every commit carries a verdict and one recommendation stands.
Gate. Show the verdicts, the conflict list, and the recommendation, then ask for explicit go. Merge only on a clear yes.
Merge. Branch off the fork's default branch (git switch -c sync/upstream-$(date +%Y-%m-%d) main) so whatever branch you were working on stays out of the sync PR. Record that base's sha (git rev-parse main); step 6 needs it. Then git merge upstream/main.
Resolve. Every conflict falls into one class:
README.md: no judgement, no union, no per-section review. Take upstream's file whole (git checkout upstream/main -- README.md), then re-insert the fork banner as its own paragraph directly after the header block's closing </p>:
> **Fork** of [`mattpocock/skills`](https://github.com/mattpocock/skills) with local tweaks. Install this one instead: `npx skills add timschoch/mattpocock-skills`
Those two lines are the fork's entire README.md diff, deliberately. Anything else that shows up in this file's diff is a merge artefact, so re-apply the rule rather than resolve it. Confirm with git diff upstream/main -- README.md: two added lines, nothing more.
Index files: skills/*/README.md, .claude-plugin/plugin.json. Fork-authored skills live outside this repo now, so these hold no fork entries. Take upstream's side whole. The one exception is skills/engineering/ask-matt/SKILL.md, which still routes to the separately-installed fork skills (marked "installed separately"). Resolve that file as a union: keep those mentions, take upstream for the rest.
Version files: package.json, the version field in .claude-plugin/plugin.json, CHANGELOG.md. Take upstream's side whole. Not .changeset/config.json, which points the changelog at timschoch/mattpocock-skills, so always take the fork's side there; upstream's would silently repoint every future changelog link at mattpocock/skills.
.changeset/: keep both sides' entries.
Shared skills the fork edited: apply upstream's edit around the fork's behaviour. .fork/adr/ records why each one exists; read the ADR that names the file before deciding. When the two genuinely contradict, stop and ask the user which wins.
Every fork edit to a skill or its docs page has an ADR. If you resolve a conflict in a skill and no ADR names that file, the fork edit has no recorded reason: take upstream's side and drop it, or ask the user. Never carry an unexplained edit forward, and never add one. Any new fork edit to a skill lands with its ADR in the same commit. The exceptions are enumerated in .fork/README.md under "Infrastructure edits"; that table plus .fork/adr/ must together cover every path in git diff --diff-filter=M --name-only "$B" HEAD.
Upstream deleted a file the fork edited (modify/delete): the fork's edit is the only thing keeping the file alive. Drop it (git rm) unless the edit stands on its own without upstream's version around it; then keep it (git add) and it becomes a fork-only path from here on. Ask the user whenever the call is not obvious.
Verify. bash .claude/skills/check-upstream/scripts/verify.sh <pre-merge sha> checks that every fork-only path is still byte-identical and every fork-only skill is still named in each index file that named it. Then claude plugin validate . --strict. Done when both pass. Whatever verify.sh flags is either restored or explained to the user as a deliberate resolution.
The sync branch carries these scripts, since it branches off the default branch. While this skill still sits on an unmerged branch, extract them first (git archive <branch> .claude/skills/check-upstream | tar -x -C .temp/) and run that copy.
PR. gh pr create --repo <fork> --base <default branch>. Name the fork explicitly: on a fork, gh aims at the upstream parent by default, which fails as does not have the correct permissions to execute CreatePullRequest. Body: the merged range, each resolution you made, and whatever still needs the user's eye. Report the URL.
1---2name: check-upstream3description: Compare this fork with its upstream and merge upstream in. Use when the user asks whether upstream has changes, wants the upstream diff reviewed, or wants upstream merged into the fork.4---56Compare `upstream` (mattpocock/skills) with this fork, recommend what to do, and, on an explicit go, merge it in as a PR that leaves every fork-only change standing.78Repo-local by design: it lives in `.claude/skills/`, outside `skills/`, so neither `scripts/link-skills.sh` nor a consumer's `skills update` distributes it. Keep it here.910Steps 1–3 are read-only. Nothing merges before a clear yes.1112## Steps13141. **Report.** Run `bash .claude/skills/check-upstream/scripts/report.sh`. It prints refs, upstream commits since the fork point, the files upstream changed, the files upstream deleted that this fork still carries, release state, fork-only paths, and a merge preview naming every file that will conflict. Done when you have its output. `up to date` → report that and stop.15162. **Recommend.** Read the diff behind each commit the report lists (`git show <sha>`); subject lines hide what actually changed. Give every one a verdict:1718 - **take**: wanted, lands on paths the fork left alone.19 - **collides**: touches a file this fork has edited; name the fork behaviour at risk.20 - **irrelevant**: touches only paths this fork does not carry.2122 Then split them on the release boundary the report prints: commits at or below the last version bump are **released**; the tail above it ships in the next version. Land on one recommendation (merge now, wait for the release, or merge with named edits) and give the reason in a line.2324 Done when every commit carries a verdict and one recommendation stands.25263. **Gate.** Show the verdicts, the conflict list, and the recommendation, then ask for explicit go. Merge only on a clear yes.27284. **Merge.** Branch off the fork's default branch (`git switch -c sync/upstream-$(date +%Y-%m-%d) main`) so whatever branch you were working on stays out of the sync PR. Record that base's sha (`git rev-parse main`); step 6 needs it. Then `git merge upstream/main`.29305. **Resolve.** Every conflict falls into one class:3132 - **`README.md`**: no judgement, no union, no per-section review. Take upstream's file **whole** (`git checkout upstream/main -- README.md`), then re-insert the fork banner as its own paragraph directly after the header block's closing `</p>`:3334 ```markdown35 > **Fork** of [`mattpocock/skills`](https://github.com/mattpocock/skills) with local tweaks. Install this one instead: `npx skills add timschoch/mattpocock-skills`36 ```3738 Those two lines are the fork's entire `README.md` diff, deliberately. Anything else that shows up in this file's diff is a merge artefact, so re-apply the rule rather than resolve it. Confirm with `git diff upstream/main -- README.md`: two added lines, nothing more.39 - **Index files**: `skills/*/README.md`, `.claude-plugin/plugin.json`. Fork-authored skills live outside this repo now, so these hold no fork entries. Take upstream's side whole. The one exception is `skills/engineering/ask-matt/SKILL.md`, which still routes to the separately-installed fork skills (marked "installed separately"). Resolve that file as a **union**: keep those mentions, take upstream for the rest.40 - **Version files**: `package.json`, the `version` field in `.claude-plugin/plugin.json`, `CHANGELOG.md`. Take upstream's side whole. **Not `.changeset/config.json`**, which points the changelog at `timschoch/mattpocock-skills`, so always take the **fork's** side there; upstream's would silently repoint every future changelog link at `mattpocock/skills`.41 - **`.changeset/`**: keep both sides' entries.42 - **Shared skills the fork edited**: apply upstream's edit around the fork's behaviour. `.fork/adr/` records why each one exists; read the ADR that names the file before deciding. When the two genuinely contradict, stop and ask the user which wins.4344 **Every fork edit to a skill or its docs page has an ADR.** If you resolve a conflict in a skill and no ADR names that file, the fork edit has no recorded reason: take upstream's side and drop it, or ask the user. Never carry an unexplained edit forward, and never *add* one. Any new fork edit to a skill lands with its ADR in the same commit. The exceptions are enumerated in `.fork/README.md` under "Infrastructure edits"; that table plus `.fork/adr/` must together cover every path in `git diff --diff-filter=M --name-only "$B" HEAD`.45 - **Upstream deleted a file the fork edited** (`modify/delete`): the fork's edit is the only thing keeping the file alive. Drop it (`git rm`) unless the edit stands on its own without upstream's version around it; then keep it (`git add`) and it becomes a fork-only path from here on. Ask the user whenever the call is not obvious.46476. **Verify.** `bash .claude/skills/check-upstream/scripts/verify.sh <pre-merge sha>` checks that every fork-only path is still byte-identical and every fork-only skill is still named in each index file that named it. Then `claude plugin validate . --strict`. Done when both pass. Whatever verify.sh flags is either restored or explained to the user as a deliberate resolution.4849 The sync branch carries these scripts, since it branches off the default branch. While this skill still sits on an unmerged branch, extract them first (`git archive <branch> .claude/skills/check-upstream | tar -x -C .temp/`) and run that copy.50517. **PR.** `gh pr create --repo <fork> --base <default branch>`. Name the fork explicitly: on a fork, `gh` aims at the upstream parent by default, which fails as `does not have the correct permissions to execute CreatePullRequest`. Body: the merged range, each resolution you made, and whatever still needs the user's eye. Report the URL.
timschoch