Vibe Cherry Pick Integration
Safely integrates commits from parallel agent branches using sequential cherry-pick. Use after parallel work completes in isolated branches or worktrees.
Install
$ agentstack add skill-ash1794-vibe-engineering-cherry-pick-integration ✓ scanned · ✓ verified — works with Claude Code, Cursor, and more.
Security review
✓ PassedNo issues found. Passed automated security review. · v0.1.0 How review works →
- ✓ Prompt-injection patterns
- ✓ Secret / credential exfiltration
- ✓ Dangerous shell & filesystem operations
- ✓ Untrusted network calls
- ✓ Known-malicious package signatures
What it can access
- ✓ Network access No
- ✓ Filesystem access No
- ✓ Shell / process execution No
- ✓ Environment & secrets No
- ✓ Dynamic code execution No
From automated source analysis of v0.1.0. “Used” means the capability is present in the source — more access means more to trust, not that it’s unsafe.
About
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-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:
``bash 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 --oneline b. Cherry-pick onto integration branch: git cherry-pick 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
- 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 & license
This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.
- Author: ash1794
- Source: ash1794/vibe-engineering
- License: MIT
Install and usage instructions live in the source repository linked above.
Reviews
No reviews yet — be the first.
Write a review
Versions
- v0.1.0 Imported from the upstream source.