upstream-fork-sync

Assess upstream diffs, merge conflicts, and customization risks for maintained Git forks.

2|Updated Jul 6, 2026
One-click install
npx skills add https://github.com/NAMEWTA/learning-open-code --skill upstream-fork-sync-namewta
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: upstream-fork-sync
Source: https://github.com/NAMEWTA/learning-open-code/tree/main/speculo/skills/upstream-fork-sync
Command: npx skills add https://github.com/NAMEWTA/learning-open-code --skill upstream-fork-sync-namewta

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve? Maintaining a long-lived fork with continuous downstream development makes it hard to know what changed upstream, what will conflict, and which customizations are at risk. This Skill freezes the integrated checkpoint and the latest upstream state, then produces reproducible diff and conflict reports without touching your branches. ## Core Features & Use Cases - Checkpoint-based assessment: Tracks the integrated upstream checkpoint separately from observed upstream tips, so fetches never silently advance integration state. - Diff and conflict reports: Generates per-repository diff reports (commits, name-status, numstat, risk paths) and conflict reports using git merge-tree, split into confirmed conflicts, auto-mergeable overlaps, customization risks, and dirty-worktree overlaps. - Integration recording: After an external merge is completed, records the merge commit and advances the checkpoint only when Git history proves the integration. - Use Case: You maintain a fork of an open-source framework with heavy local changes. Run an assessment to get a frozen snapshot of upstream commits since your last integration, see exactly which files conflict, and decide whether to merge now or defer. ## Quick Start Ask the agent to assess the upstream sync status of this fork and generate the diff and conflict reports for the current repositories.

Frequently Asked Questions about upstream-fork-sync

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I check what changed upstream in my Git fork?▼

Run the assess command with a topic to freeze the current upstream tip against your saved integration checkpoint. It generates a diff report listing new upstream commits, changed files with numstat, and paths overlapping your product changes.

How to detect merge conflicts before merging upstream into a fork?▼

The skill runs git merge-tree --write-tree --messages on the frozen product and upstream SHAs, which simulates the merge without touching your index, worktree, or refs. Conflicts are reported separately from auto-mergeable overlaps and dirty-worktree intersections.

Does this skill automatically merge or push upstream changes?▼

No. It never merges, commits, pushes, rebases, or moves refs. It only produces frozen assessment reports; the optional record-integration command updates checkpoints after you complete a merge externally and it is verified in Git history.

Does upstream sync assessment require network access?▼

No, it works offline using local refs by default. Network fetch of upstream and origin remotes only happens when you explicitly pass the --fetch flag, and failed fetches are marked stale rather than treated as current.

Why does the conflict report say zero conflicts but still warn about risk?▼

Zero textual conflicts from git merge-tree only means no overlapping line edits. It cannot prove compilation, runtime behavior, API compatibility, data migrations, or business logic safety, so customization risk paths still need semantic review.