/git:upstream-pr-diverged Submit a single commit from a heavily-diverged fork back to upstream as a clean, regression-free PR. The simpler covers aligned-fork cherry-picks; this skill handles the case where direct rebase fails. When to Use This Skill | Use this skill when... | Use instead when... | |------------------------|----------------------------------------| | Fork has substantially diverged from upstream | Fork and upstream are roughly aligned | | Cherry-pick may produce many conflicts on shared modules | Single commit applies cleanly | | You need patch-id matching for already-applied…