vibe-cherry-pick-integration
Scannednpx machina-cli add skill ash1794/vibe-engineering/cherry-pick-integration --openclawvibe-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-decompositiondispatched 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
-
Inventory branches — List all branches with completed work:
git branch --list 'worktree-*' 'feature/*' -
Determine integration order — Cherry-pick in dependency order:
- Independent tasks first (any order within batch)
- Dependent tasks after their dependencies
-
For each branch: a. Identify commits to cherry-pick:
git log main..branch-name --onelineb. 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 --continued. Run tests after each cherry-pick:[test command]e. If tests fail: fix before proceeding to next branch
-
Verify integration — Run full test suite after all cherry-picks
-
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
- [File]: [How it was resolved]
Final Status
- All tests passing: Yes/No
- Integration branch: [name]
- Ready to merge: Yes/No
Source
git clone https://github.com/ash1794/vibe-engineering/blob/master/skills/cherry-pick-integration/SKILL.mdView on GitHub Overview
Safely merge commits from parallel agent branches by cherry-picking them one by one onto an integration branch. It helps avoid destructive merge conflicts when multiple teams work in isolated branches or worktrees. Use this after vibe-parallel-task-decomposition dispatches work.
How This Skill Works
Inventory branches matching worktree or feature patterns, then determine an integration order based on dependencies (independent tasks first, dependents later). For each branch, identify commits with git log main..branch-name --oneline, cherry-pick them onto the integration branch, resolve conflicts by preserving the semantic intent, run git cherry-pick --continue, and test after each pick. Finally verify the full integration with the test suite and optionally clean up integrated branches.
When to Use It
- 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.
- Parallel work branches to be integrated without pre-merge conflicts.
- You want to test after each cherry-pick before proceeding.
Quick Start
- Step 1: Inventory branches — git branch --list 'worktree-*' 'feature/*'.
- Step 2: Determine integration order — cherry-pick in dependency order (independent first, then dependents).
- Step 3: For each branch, identify commits, cherry-pick, resolve conflicts, run tests after each pick, then verify integration and clean up if desired.
Best Practices
- Inventory branches matching worktree-* or feature/* before starting.
- Determine integration order by dependency: independent tasks first, dependents later.
- Cherry-pick commits selectively: identify commits with git log main..branch-name --oneline.
- If conflicts arise, resolve keeping the semantic intent of both sides and run git cherry-pick --continue, then re-run tests after each pick.
- Verify the integration by running the full test suite after all cherry-picks and clean up merged branches if desired.
Example Use Cases
- Integrating worktree-abc and worktree-def onto a single integration branch with 3 and 2 commits respectively.
- Cherry-picking independent tasks first, then dependent tasks to satisfy dependencies.
- Resolving a conflict by preserving semantic intent and continuing the cherry-pick.
- Running tests after each cherry-pick to catch issues early in the flow.
- Cleaning up integrated branches once the merge is verified.
