Fetch, classify, and cherry-pick upstream commits into a fork.
npx skills add https://github.com/buvis/home --skill catchup-upstream
Please help me install this Agent Skill. Skill: catchup-upstream Source: https://github.com/buvis/home/tree/main/.claude/skills/catchup-upstream Command: npx skills add https://github.com/buvis/home --skill catchup-upstream
Sync a fork with upstream by reviewing new commits and selectively applying relevant changes.
Provide the upstream owner/repo or URL and let the tool fetch, review, and selectively apply new commits.
High-intent search queries and answers about installing and using this skill.
To selectively cherry-pick upstream commits to your git fork, this Skill fetches new upstream changes, classifies them as take or skip, and applies only the approved patches via git cherry-pick. It handles conflicts with guided manual adaptation.
Incremental upstream review works across multiple fork branches by using a stored cursor to track the last reviewed commit. This allows you to fetch, diff, and classify only new upstream changes for each branch during subsequent syncs.
The best way to sync a fork without merging everything is to review a diff of new upstream commits and selectively apply relevant patches. You classify changes as take, skip, or ask, then cherry-pick approved commits individually.
You may need to manually resolve conflicts when cherry-picking upstream changes. When the cherry-pick encounters a conflict, the Skill provides guided manual adaptation steps to help you integrate the patch correctly into your fork.
Yes, you can review upstream changes before applying them to your fork. The Skill presents a summary of new commits classified as take, skip, or ask, allowing you to approve changes before any git cherry-pick operations are executed.
sluongngRebase fork/stack onto origin/main and publish merge commits to fork/main.
MatiasComercioCompute the true fork point of a Git branch despite history rewrites.
AztecProtocolRebase a pull request onto its base branch and resolve conflicts with git and GitHub CLI.
spyqsSynchronize a customized NanoClaw fork with upstream updates via merge, cherry-pick, or rebase.
