refresh-ffmpeg-patches

To rebase ffmpeg patches onto upstream changes, the Skill applies each patch in the series against a chosen ffmpeg ref using a three-way merge workflow. This automates the patch rebase process to keep your integration current after updating upstream sources.

An ffmpeg build fails when a patch no longer applies cleanly due to upstream code drift causing patch application errors. This Skill detects failed patches, captures conflicting hunks, and separates trivial conflicts from issues requiring human review.

The best way to refresh a patch series after ffmpeg updates is to rebuild cleanly rebased patches into a refreshed series. This Skill regenerates patches after drift, ensuring your integration stays current and reducing manual review effort.

Three-way patch application for conflict resolution in ffmpeg works by applying each patch against a chosen ref to merge changes. The Skill captures conflicting hunks and reports unresolved conflicts for review, separating trivial issues from complex ones.

You can automate conflict triage for failed patches in an ffmpeg patch series using this Skill. It detects failed patches, captures the conflicting hunks, and separates trivial conflicts from issues that need human review during upstream synchronization.

When a patch rebase leaves unresolved conflicts for review, you should manually resolve the issues flagged by the conflict triage. The Skill separates trivial conflicts from those needing human review and reports them for manual intervention.