Agent skill

Vibe Cherry Pick Integration

by ash1794 in ash1794/vibe-engineering

Safely integrates commits from parallel agent branches using sequential cherry-pick.

MITAuto-check passedAgent Workflows

Install Vibe Cherry Pick Integration

skills CLI
$ npx skills add ash1794/vibe-engineering --skill vibe-cherry-pick-integration -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install ash1794/vibe-engineering vibe-cherry-pick-integration --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/ash1794/vibe-engineering.git skills-src && mkdir -p .claude/skills && cp -r skills-src/plugins/vibe-engineering/skills/vibe-cherry-pick-integration .claude/skills/vibe-cherry-pick-integration && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
vibe-cherry-pick-integration
GitHub stars
163
Token cost
~573 tokens
SKILL.md length
244 words
Files
1
Skills in repo
33
Repo updated
First seen
Licence
MIT

At a glance

Safely integrates commits from parallel agent branches using sequential cherry-pick.

  • Works in 5 steps: Inventory branches — List the branches… → Determine integration order —… → For each branch → …
  • Tasks that involve Git worktrees
  • SKILL.md covers When to Use This Skill, When NOT to Use This Skill, Steps and Output Format
  • Calls git

What it does

Vibe Cherry Pick Integration is an agent skill from ash1794/vibe-engineering. Safely integrates commits from parallel agent branches using sequential cherry-pick. Use after parallel work completes in isolated branches or worktrees.

Its SKILL.md is about 570 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Agent Workflows, covering Git worktrees and Subagents. It works with Git. The repository describes itself as: 33 engineering discipline skills for Claude Code, OpenAI Codex & Gemini CLI + a CLI for CI/CD enforcement. Extracted from real-world multi-agent system development. Born from… The licence is MIT.

When your agent uses it

  • Tasks that involve Git worktrees
  • Tasks that involve Subagents

Example prompts

  • “/vibe-cherry-pick-integration”

Workflow steps

5 steps, taken from the first numbered list in SKILL.md.

  1. Inventory branches — List the branches and worktrees with completed work. Harnesses name them differently, so list rather than guess a…
  2. Determine integration order — Cherry-pick in dependency order
  3. For each branch
  4. Verify integration — Run full test suite after all cherry-picks
  5. Clean up — Remove integrated branches if desired

What it can do on your machine

Read from SKILL.md and the folder at commit 8f1d71b. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Vibe Cherry Pick Integration loads about 573 tokens when it runs. Until then it costs about 46 tokens; SKILL.md has 244 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~46
When it runs · the whole SKILL.md, loaded when a task matches
~573

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from ash1794/vibe-engineering at commit 8f1d71b, republished under its MIT licence (© ash1794). 244 words, ~573 tokens.

Download SKILL.mdSave it as .claude/skills/vibe-cherry-pick-integration/SKILL.md (or your agent's skills folder).
name
vibe-cherry-pick-integration
description
Safely integrates commits from parallel agent branches using sequential cherry-pick. Use after parallel work completes in isolated branches or worktrees.
user-invocable
true

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:

    bash
    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

BranchCommitsConflictsTests After
agent/auth-stream30PASS
agent/api-stream21PASS
Conflict Resolutions
  1. [File]: [How it was resolved]
Final Status
  • All tests passing: Yes/No
  • Integration branch: [name]
  • Ready to merge: Yes/No

© ash1794, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in plugins/vibe-engineering/skills/vibe-cherry-pick-integration of ash1794/vibe-engineering.

Open the folder on GitHubat commit 8f1d71b

Compare with similar skills

Vibe Cherry Pick Integration next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Vibe Cherry Pick Integration compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Vibe Cherry Pick Integration this skillash1794/vibe-engineering163—~573Automated safety check: PassMIT
Vspawnvlinx-io/VelaTerm275—~2.5kAutomated safety check: PassMIT
PmApra-Labs/apra-fleet101—~5.4kAutomated safety check: PassCustom licence
Qwen Code Team CoordinatorQwenLM/qwen-code28k—~994Automated safety check: PassApache-2.0
Vspawn Treevlinx-io/VelaTerm275—~1.8kAutomated safety check: PassMIT
Agenthubalirezarezvani/claude-skills28k—~2kAutomated safety check: PassMIT

Similar skills

  • Vspawn

    vlinx-io/VelaTerm

    Explicitly spawn a standalone child session under the current vlx-term session, passing the task in as its first message (mirrors spawntask).

    275 GitHub stars~2.5k tokensUpdated 2 days ago
    Agent WorkflowsAuto-check passed
  • Pm

    Apra-Labs/apra-fleet

    Project Manager skill. An agent skill from Apra-Labs/apra-fleet.

    101 GitHub stars~5.4k tokensUpdated today
    Agent WorkflowsAuto-check passed
  • Leads a small team of Qwen Code teammates: read-only investigators work in parallel, then one writer pinned to a git worktree makes the changes.

    28k GitHub stars~994 tokensUpdated today
    Agent WorkflowsAuto-check passed
  • Vspawn Tree

    vlinx-io/VelaTerm

    Same as /vspawn, but opens a dedicated git worktree for the child session (equivalent to vspawn --worktree).

    275 GitHub stars~1.8k tokensUpdated 2 days ago
    Agent WorkflowsAuto-check passed
  • Agenthub

    alirezarezvani/claude-skills

    Multi-agent collaboration plugin that spawns N parallel subagents competing on the same task via git worktree isolation.

    28k GitHub stars~2k tokensUpdated 1 mo ago
    Agent WorkflowsAuto-check passed
  • ClawTeam Multi-Agent Swarm

    win4r/ClawTeam-OpenClaw

    Launches a swarm of specialist Hermes agents in git-worktree-isolated tmux windows with a kanban board and file-based inboxes, using built-in templates like hedge-fund and code-review.

    1.5k GitHub starsUsed in 1 repo~2.9k tokens
    Agent WorkflowsAuto-check passed

More from ash1794/vibe-engineering

All 33 skills in this repo
  • Vibe Concurrent Test Safety

    ash1794/vibe-engineering

    Audits tests for concurrency safety — race conditions, shared mock state, cleanup ordering.

    163 GitHub stars~665 tokensUpdated 2 days ago
    Auto-check passed
  • Vibe Fuzz Parser Inputs

    ash1794/vibe-engineering

    Generates fuzz test scaffolding for parsers handling external input (YAML, JSON, config files, user input).

    163 GitHub stars~722 tokensUpdated 2 days ago
    Auto-check passed
  • Vibe Golden File Testing

    ash1794/vibe-engineering

    Implements snapshot/golden file tests with temporal normalization so tests don't break daily.

    163 GitHub stars~669 tokensUpdated 2 days ago
    Auto-check passed
  • Vibe Parallel Task Decomposition

    ash1794/vibe-engineering

    Analyzes large tasks for independent subtasks that can be safely parallelized.

    163 GitHub stars~717 tokensUpdated 2 days ago
    Auto-check passed
  • Vibe Slop Filter

    ash1794/vibe-engineering

    Strips AI-generation "smell" from prose before it ships (READMEs, docs, release notes, PR descriptions, posts, emails).

    163 GitHub stars~2.3k tokensUpdated 2 days ago
    Auto-check passed
  • Vibe Spec Sync

    ash1794/vibe-engineering

    Keeps specification documents and code in agreement. An agent skill from ash1794/vibe-engineering.

    163 GitHub stars~2.2k tokensUpdated 2 days ago
    Auto-check passed

Works with

Questions about Vibe Cherry Pick Integration

What does Vibe Cherry Pick Integration do?

Safely integrates commits from parallel agent branches using sequential cherry-pick. Vibe Cherry Pick Integration is an agent skill from ash1794/vibe-engineering. Safely integrates commits from parallel agent branches using sequential cherry-pick.

When should I use Vibe Cherry Pick Integration?

Vibe Cherry Pick Integration fits situations like: tasks that involve Git worktrees; tasks that involve Subagents.

How do I install Vibe Cherry Pick Integration in Claude Code?

Run `npx skills add ash1794/vibe-engineering --skill vibe-cherry-pick-integration -a claude-code`. Or copy the skill folder (plugins/vibe-engineering/skills/vibe-cherry-pick-integration in ash1794/vibe-engineering) into .claude/skills/vibe-cherry-pick-integration in your project. Claude Code loads it when a task matches its description.

How do I install Vibe Cherry Pick Integration in Codex?

Run `npx skills add ash1794/vibe-engineering --skill vibe-cherry-pick-integration -a codex`. Or copy the skill folder (plugins/vibe-engineering/skills/vibe-cherry-pick-integration in ash1794/vibe-engineering) into .agents/skills/vibe-cherry-pick-integration in your project. Codex loads it when a task matches its description.

Can I use Vibe Cherry Pick Integration in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add ash1794/vibe-engineering --skill vibe-cherry-pick-integration -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/vibe-cherry-pick-integration, .gemini/skills/vibe-cherry-pick-integration, .github/skills/vibe-cherry-pick-integration and .opencode/skills/vibe-cherry-pick-integration in your project.

What does Vibe Cherry Pick Integration need to run?

Going by SKILL.md and its folder, Vibe Cherry Pick Integration needs the command-line tools its instructions call (git).

Does Vibe Cherry Pick Integration access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Vibe Cherry Pick Integration safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Vibe Cherry Pick Integration use?

Vibe Cherry Pick Integration is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Vibe Cherry Pick Integration use?

About 573 tokens (SKILL.md is roughly 2.3k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Vibe Cherry Pick Integration?

Skills that share tags, products or a category with Vibe Cherry Pick Integration: Vspawn (vlinx-io/VelaTerm, 275 stars), Pm (Apra-Labs/apra-fleet, 101 stars), Qwen Code Team Coordinator (QwenLM/qwen-code, 28k stars) and Vspawn Tree (vlinx-io/VelaTerm, 275 stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Vibe Cherry Pick Integration?

ash1794 (a GitHub user) maintains it in ash1794/vibe-engineering, which has 163 GitHub stars. The repository holds 33 skills in this directory. The repository was last updated on October 7, 2026.

Source: ash1794/vibe-engineering on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.