vibe-cherry-pick-integration

vibe-cherry-pick-integration is a skill for Claude Code from ash1794/vibe-engineering. It costs 35 tokens per session (514 once invoked), scanned A, original, MIT.

A Git integration helper for bringing commits from separate branches into one branch after parallel development. Cherry-picking means applying selected commits from another branch without merging the entire branch.

In plain words
What is it for?
Use it after multiple agents or developers finish work in isolated branches or worktrees. It is not meant for ordinary single-branch work or conflicts that require deliberate manual merging.
Why use it?
It gives a defined order for combining independent changes and a process for handling conflicts without losing their intended behavior.

Skill for Claude Code

Written for Claude Code: user-invocable in frontmatter.

Part of the vibe-engineering plugin — 38 skills shipped together

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/ash1794/vibe-engineering/cherry-pick-integration
Any agent
npx skills add ash1794/vibe-engineering --skill cherry-pick-integration
Clone the repo
git clone --depth 1 https://github.com/ash1794/vibe-engineering

Made for: Claude Code.

Or install vibe-engineering, the plugin that ships this one along with the rest of its 38 skills.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for vibe-cherry-pick-integration

README.md
[![agentmods](https://agentmods.dev/badge/skills/ash1794/vibe-engineering/cherry-pick-integration.svg)](https://agentmods.dev/skills/ash1794/vibe-engineering/cherry-pick-integration)
Your own site
<a href="https://agentmods.dev/skills/ash1794/vibe-engineering/cherry-pick-integration"><img src="https://agentmods.dev/badge/skills/ash1794/vibe-engineering/cherry-pick-integration.svg" alt="Measured on agentmods" height="20"></a>
Per session 35 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 514 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00035 $0.00514
Opus 5 $0.00017 $0.00257
Sonnet 5 $0.00007 $0.00103
Haiku 4.5 $0.00003 $0.00051

Measured 6d ago against content hash fac6194665e2, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-06, from the pricing page.

Security

Grade A, and why

vibe-cherry-pick-integration scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 6d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

Origin

Copies of this mod

1 near-identical copy found in the catalogue:

plugins/vibe-engineering/skills/cherry-pick-integration/SKILL.md · 69 lines

What it actually says

vibe-cherry-pick-integration

Parallel agents produce parallel branches. This skill integrates them safely without merge conflicts destroying work.

When to Use This Skill

  • Multiple agents completed work in isolated branches/worktrees
  • Need to combine parallel work onto a single integration branch
  • After vibe-parallel-task-decomposition dispatched work

When NOT to Use This Skill

  • Single branch with sequential work (just push)
  • Merge conflicts are expected and desired for resolution
  • The parallel work was all in the same files (this won't help — resolve manually)

Steps

  1. Inventory branches — List all branches with completed work:

    git branch --list 'worktree-*' 'feature/*'
    
  2. Determine integration order — Cherry-pick in dependency order:

    • Independent tasks first (any order within batch)
    • Dependent tasks after their dependencies
  3. For each branch: a. Identify commits to cherry-pick: git log main..branch-name --oneline b. Cherry-pick onto integration branch: git cherry-pick <commit-hash> c. If conflict:

    • Examine both sides
    • Resolve keeping the semantic intent of both
    • git cherry-pick --continue d. Run tests after each cherry-pick: [test command] e. If tests fail: fix before proceeding to next branch
  4. Verify integration — Run full test suite after all cherry-picks

  5. Clean up — Remove integrated branches if desired

Output Format

Cherry-Pick Integration

Branches integrated: X Commits cherry-picked: Y Conflicts resolved: Z Tests: PASS/FAIL after integration

Branch Commits Conflicts Tests After
worktree-abc 3 0 PASS
worktree-def 2 1 PASS

Conflict Resolutions

  1. [File]: [How it was resolved]

Final Status

  • All tests passing: Yes/No
  • Integration branch: [name]
  • Ready to merge: Yes/No
Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 6d ago First seen · 69 lines · 35 tokens per session scan A fac6194665e2

Subscribe to this mod's changes

vibe-cherry-pick-integration is a skill published in the GitHub repository ash1794/vibe-engineering (10 stars, last pushed 3mo ago), licensed MIT. It adds 35 tokens to every session and 514 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Related

Other skills, from other repositories

precommit

Pre-commit checks — lint:fix -> build -> test.

sd0xdev/sd0x-harness · 15 tokens

next-step

Change-aware next step advisor. Use when: user asks what to do next, workflow progression is unclear, session just started with dirty worktree. Not for: executing the suggested command (user decides), auto-loop decisions (hooks handle that). Output: findings-based suggestions or session summary with commit seed.

sd0xdev/sd0x-harness · 63 tokens

precommit-fast

Quick pre-commit checks — lint:fix -> test.

sd0xdev/sd0x-harness · 15 tokens

smart-commit

Smart batch commit. Analyzes uncommitted changes, groups by cohesion, generates commit messages matching project style. Default: output git commands for manual execution. With --execute: directly run git add + git commit (requires user approval). Use when: user says 'commit', 'batch commit', 'prepare commit', 'write…

sd0xdev/sd0x-harness · 78 tokens

specstory-guard

Install a pre-commit hook that scans .specstory/history for secrets before commits. Run when user says "set up secret scanning", "install specstory guard", "protect my history", or "check for secrets".

specstoryai/agent-skills · 49 tokens

principle-sequence-verifiable-units

Apply to multi-step work (sweeps, migrations, runs of similar edits) and to how you stack commits and PRs. Break work into small units that each end in a verifiable state, check each before the next, and order delivery so the sequence proves itself to a reviewer.

painhardcore/pstack · 68 tokens