skills.rest
VMAFx
VMAFxOFFICIAL
Explore all skills by this author →
WebsiteGitHub

sync-upstream

Reconcile a forked Git repository with its upstream branch.

3|1|Updated May 28, 2026
Search Tags:#git#pull request#conflict resolution#merge-base#upstream sync#fork maintenance
One-click install
npx skills add https://github.com/VMAFx/vmafx --skill sync-upstream-vmafx
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: sync-upstream
Source: https://github.com/VMAFx/vmafx/tree/main/.claude/skills/sync-upstream
Command: npx skills add https://github.com/VMAFx/vmafx --skill sync-upstream-vmafx

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Keeps a maintained fork aligned with its upstream source while avoiding destructive or misleading merges when the histories are not actually connected.

Core Features & Use Cases

  • Detects whether the repository has a shared merge base or a port-only topology with no common ancestor.
  • Produces a coverage report that identifies upstream commits already present in the fork, including silently ported changes.
  • Supports a classic merge workflow only when the histories are genuinely related, with clear conflict policy guidance.
  • Use it when you need to audit upstream parity, prepare a safe synchronization branch, or decide which upstream commits still need to be ported.

Quick Start

Ask the assistant to run the sync-upstream workflow for the current fork and report any missing upstream commits or safe merge steps.

Frequently Asked Questions about sync-upstream

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

FAQPage Schema
How do I sync a fork with upstream when there is no shared merge base?▼

To sync a fork with upstream without a shared merge base, topology detection identifies port-only histories and reports coverage to safely reconcile divergent commits. This avoids risky merges by validating safe synchronization before generating a PR.

How can I check if upstream commits are already present in my fork?▼

A coverage report checks if upstream commits are already present in your fork, including silently ported or cherry-picked changes. It audits upstream parity by identifying missing commits and detecting which changes still need porting.

What is the best way to reconcile a Git fork with squashed upstream commits?▼

Reconciling a Git fork with squashed upstream commits requires detecting the port-only topology and generating a coverage report. This enforces conflict policies and validates safe merge steps before creating a pull request.

How do I prevent destructive merges when synchronizing a Git fork?▼

Preventing destructive merges during Git fork synchronization requires enforcing conflict policies and safe validation before PR generation. Topology detection ensures classic merge workflows only proceed when histories are genuinely related.

Can I use a classic merge workflow for cherry-picked commits in a forked repository?▼

A classic merge workflow for cherry-picked commits works only when forked repository histories are genuinely related. Topology detection verifies the shared merge base, enforcing conflict policies and safe validation before proceeding with the merge.

Related Skills

Explore More Software Engineering Skills→
sluongngsluongng
6

buck2-stack-maintainer

Rebase fork/stack onto origin/main and publish merge commits to fork/main.

Community
Advanced
JeremyKuhneJeremyKuhne
9

create-pr

Create pull requests from feature branches to target main branches.

Community
Intermediate
eivindebeivindeb

manual-merge-branches

Merge Git branches with explicit user approval for each conflict resolution.

Community
Advanced
WaterplanAIWaterplanAI
31

git-find-fork

Find a Git branch's true fork point after rebases or squashes.

Official
Basic