port-upstream-commit

Cherry-pick an upstream commit onto a fork's master branch with provenance.

3|1|Updated May 28, 2026
One-click install
npx skills add https://github.com/VMAFx/vmafx --skill port-upstream-commit
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: port-upstream-commit
Source: https://github.com/VMAFx/vmafx/tree/main/.claude/skills/port-upstream-commit
Command: npx skills add https://github.com/VMAFx/vmafx --skill port-upstream-commit

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill streamlines the safe porting of a single upstream commit into the fork's master branch, reducing the manual effort of cherry-picking changes and preserving a clear link back to upstream history.

Core Features & Use Cases

  • Upstream Cherry-Picking: Applies one commit with upstream provenance preserved in the message.
  • Conflict-Aware Porting: Detects merge conflicts and flags them for human review instead of force-resolving them.
  • Backend Propagation Guidance: Highlights sibling SIMD and GPU implementations that may need the same change when a feature exists in multiple variants.
  • Validation Workflow: Runs the CPU build, fast tests, and cross-backend diff checks to confirm the port is sound.
  • PR Automation: Optionally opens a pull request with a structured title, upstream link, conflict summary, and propagation notes.

Quick Start

Ask the assistant to port a specific upstream commit onto the fork and open a pull request if requested.

Frequently Asked Questions about port-upstream-commit

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

FAQPage Schema
How do I cherry-pick an upstream commit without breaking SIMD and GPU backends?

Cherry-picking an upstream commit across multiple backends requires applying the change to the master branch, manually propagating it to sibling CPU, SIMD, CUDA, SYCL, or Vulkan implementations, and running cross-backend diff validation to ensure nothing breaks.

What should I do if a cherry-picked upstream commit causes merge conflicts?

When a cherry-picked upstream commit causes merge conflicts, the process detects them and flags them for human review instead of force-resolving, ensuring you inspect conflicts manually before proceeding with the port.

How do I preserve upstream provenance when porting a git commit into a fork?

To preserve upstream provenance when porting a git commit, the cherry-pick applies the single commit onto the fork's master branch while retaining the original upstream commit link and historical reference within the commit message.

Can I automatically open a pull request after porting a commit from upstream?

Yes, after porting a commit from upstream, you can automatically open a pull request that includes a structured title, the linked upstream commit, conflict summary, and backend propagation notes.

How do I validate a ported upstream fix across CPU and GPU paths?

Validating a ported upstream fix across CPU and GPU paths involves running the CPU build, executing fast tests, and performing cross-backend diff checks to confirm the port is sound across all sibling implementations.

When do I need to manually propagate changes to sibling SIMD and CUDA implementations?

Manual propagation to sibling SIMD, CUDA, SYCL, or Vulkan implementations is needed when a ported upstream feature exists in multiple backend variants and the cherry-picked change must be applied across all relevant paths to maintain consistency.