cherrypick-from-main

Cherry-pick generic commits from main into the adapter-kit branch with audit and verification gates.

Updated Aug 28, 2026
One-click install
npx skills add https://github.com/jingtao-lbl/A2MC --skill cherrypick-from-main-jingtao-lbl
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: cherrypick-from-main
Source: https://github.com/jingtao-lbl/A2MC/tree/main/.claude/skills/cherrypick-from-main
Command: npx skills add https://github.com/jingtao-lbl/A2MC --skill cherrypick-from-main-jingtao-lbl

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Keeping a long-lived adapter-kit branch synchronized with main without pulling in site-specific calibration work is error-prone: a blind merge forks generic tooling around one site, and a blind cherry-pick drags in contaminated files. This Skill codifies the audited, selective cherry-pick workflow that keeps adapter-kit a superset of main's generic capability only. ## Core Features & Use Cases - Audit and categorize pass: Classifies every incoming commit as GENERIC (cherry-pick), SITE-SPECIFIC (skip), ALREADY PRESENT (skip), or MIXED (pick then strip site paths) based on touched file paths. - Hard invariant enforcement: Verifies adapter-kit never forks FATES-shared files, with a decision table distinguishing acceptable generalization from forbidden divergence. - Conflict and verification gates: Provides the 7 known conflict-prone files with keep-BOTH resolution rules, plus a post-transfer test suite (adapter conformance validators, parity checks, e2e tests, RAG guards). - Use Case: After main advances with 44 commits mixing generic tooling and Kougarok site work, run this Skill to cherry-pick only the generic deltas, resolve conflicts in rag/milestones.json by keeping both entries, and verify all onboarded model adapters still pass. ## Quick Start Ask the agent to cherry-pick main's generic updates into the adapter-kit branch and verify the adapters still pass.

Frequently Asked Questions about cherrypick-from-main

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

FAQPage Schema
How do I cherry-pick only some commits from main into another branch?▼

Audit each incoming commit with git log and git show --stat, categorize by touched file paths, then cherry-pick only the generic ones in chronological order. Skip commits touching only site-specific directories, and for mixed commits use git cherry-pick -n and unstage the unwanted paths.

When should I use a full merge instead of cherry-picking from main?▼

A full merge is justified only when every incoming commit is generic, with zero site-specific paths in the range. Check with git log --name-only and grep for the site directories; any hit means you must cherry-pick selectively instead.

How do I resolve conflicts in files both branches edit?▼

For the known conflict-prone files like shared JSON, YAML, and markdown indexes, resolve by keeping both sides' additions rather than choosing one. A resolution that deletes entries originating from the other branch is wrong; the merge should add, never delete.

What should I check after cherry-picking commits between branches?▼

Run the project's conformance validators and test suites for every affected component, and confirm no shared files were deleted by a bad conflict resolution. Also check that citations and links in cherry-picked documents resolve on the target branch, porting or rewording any that point at source-only paths.

How do I land a contaminated feature branch without merging it?▼

Split the branch by layer rather than by commit, since contaminated and clean changes are interleaved. Take the generic tooling by path with git checkout <branch> -- <paths>, and leave the model-specific layer on the branch until its repair lands.