Skip to content

ash1794/vibe-engineering / plugins/vibe-engineering/skills/vibe-cherry-pick-integration

vibe-cherry-pick-integration

Verified

Safely integrates commits from parallel agent branches using sequential cherry-pick. Use after parallel work completes in isolated branches or worktrees.

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

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
reverse-engineer-anythingmorluto/reaReverse engineer native, managed, Electron/JavaScript, packaged, firmware, and browser targets with REA, and build agent environments (AgentEnv bundles) of web applications from a live instance or a capture, and of Linux desktop apps with a task from a request. Use shipped-artifact or requested runtime evidence to explain features, compare versions, decompile code, or guide a reconstruction. Skip REA for ordinary source-repository architecture analysis.Stars: 468kUpdated Claude CodeCodexVerifiedInstall
diagnosing-superpowersobra/superpowersUse when a superpowers session went wrong and your human partner wants to know why — repeated work, ignored plans, stumbles, poor results, a skill that didn't fire, "it took too long", "why is it so expensive", "what is it doing" — or wants to build a bug report for the superpowers maintainers, for the current session or a past one identified by id or path, on any harness.Stars: 321kUpdated Claude CodeCodexVerifiedInstall
dispatching-parallel-agentsobra/superpowersUse when facing 2+ independent tasks that can be worked on without shared state or sequential dependenciesStars: 321kUpdated Claude CodeCodexVerifiedInstall
executing-plansobra/superpowersUse when executing an implementation plan in the current session as the implementer yourself — your human partner chose inline execution, or no subagent tool is availableStars: 321kUpdated Claude CodeCodexVerifiedInstall