vibe-cherry-pick-integration

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

A workflow for bringing selected commits from separate Git branches into one branch. Cherry-picking means copying specific commits rather than merging an entire branch.

In plain words
What is it for?
Use it to combine independent or dependent changes after multiple coding agents finish their work.
Why use it?
It reduces the chance of combining parallel work in the wrong order or losing track of which changes should be integrated. It is intended for work completed in separate branches or worktrees.

Skill for Claude Code

Written for Claude Code: user-invocable in frontmatter.

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

Good fit Use it to combine independent or dependent changes after multiple coding agents finish their work.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/ash1794/vibe-engineering/vibe-cherry-pick-integration
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.

Any agent
npx skills add ash1794/vibe-engineering --skill vibe-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 33 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/vibe-cherry-pick-integration/github.svg)](https://agentmods.dev/skills/ash1794/vibe-engineering/vibe-cherry-pick-integration)
Your own site
<a href="https://agentmods.dev/skills/ash1794/vibe-engineering/vibe-cherry-pick-integration"><img src="https://agentmods.dev/badge/skills/ash1794/vibe-engineering/vibe-cherry-pick-integration/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for vibe-cherry-pick-integration

Your own site · 80×15
<a href="https://agentmods.dev/skills/ash1794/vibe-engineering/vibe-cherry-pick-integration"><img src="https://agentmods.dev/badge/skills/ash1794/vibe-engineering/vibe-cherry-pick-integration.svg" alt="Reviewed on agentmods" width="80" 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 536 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
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.00536
Opus 5.5 $0.00014 $0.00214
Sonnet 5.5 $0.00007 $0.00107
Haiku 4.5 $0.00003 $0.00054

Measured 20d ago against content hash a06e8229a160, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, 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 20d 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/vibe-cherry-pick-integration/SKILL.md · 70 lines

How it starts

The opening of the file, as written. The whole thing — 70 lines — stays where its author put it; the contents beside it link to each section on GitHub.

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 the branches and worktrees with completed work. Harnesses name them differently, so list rather than guess a pattern:

    git worktree list
    git branch --sort=-committerdate | head -20
    
  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
agent/auth-stream 3 0 PASS
agent/api-stream 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

Read the full file on GitHub · 70 lines

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. 20d ago First seen · 70 lines · 35 tokens per session scan A a06e8229a160

Subscribe to this mod's changes

vibe-cherry-pick-integration is a skill published in the GitHub repository ash1794/vibe-engineering (164 stars, last pushed 9d ago), licensed MIT. It adds 35 tokens to every session and 536 once invoked, about $0.0001 per session on Opus 5.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-09-26.