Validates completed work against defined acceptance criteria. Use after completing a task that has specific success criteria defined in issues, specs, or task descriptions.
中文简介正在准备中。当前显示原文说明。
ash1794/vibe-engineering1642026年10月8日 更新
免费在 GitHub 公开
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.
中文简介正在准备中。当前显示原文说明。
查看安装方法包含的文件（1）
- SKILL.md2.2 KB
SKILL.md（原文）
安装前可以查看交给 AI 代理的指令内容。
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 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 -
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 |
|---|---|---|---|
| agent/auth-stream | 3 | 0 | PASS |
| agent/api-stream | 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
评价
还没有评价。欢迎分享你的使用感受。
评论
无需登录即可发表。欢迎分享使用感受、提问，或说明在哪些环境下无法运行。
还没有评论。来写第一条吧。
同一仓库的技能
Generates edge case, failure mode, and spec-driven test cases. Covers boundary values, nil inputs, concurrency, resource exhaustion, malformed data, and requirement-linked traceability tests. Use after happy-path tests exist and before claiming coverage is complete, when requirements lack tests, or before a security review.
中文简介正在准备中。当前显示原文说明。
ash1794/vibe-engineering1642026年10月8日 更新
Catches shortcuts and reward hacking — weakening or deleting tests to make them pass, hard-coding expected outputs, silently dropping requirements, or claiming work is done without running it. Use before declaring a task complete and whenever a test or requirement feels like it's in the way.
中文简介正在准备中。当前显示原文说明。
ash1794/vibe-engineering1642026年10月8日 更新
Audits tests for concurrency safety — race conditions, shared mock state, cleanup ordering. Use when writing tests that involve goroutines, async operations, or shared mutable state.
中文简介正在准备中。当前显示原文说明。
ash1794/vibe-engineering1642026年10月8日 更新
Enforces tiered test coverage standards with three dimensions — line coverage by tier, spec-to-test traceability, and spec-to-code implementation mapping. Use before claiming code is complete.
中文简介正在准备中。当前显示原文说明。
ash1794/vibe-engineering1642026年10月8日 更新
Extracts and records architectural decisions from diffs, conversation context, and explicit choices. Supports automatic extraction from staged changes, deduplication against prior decisions, and persistent ADR-format logging with spec traceability. Use after a significant design or architecture choice, before committing a diff that embeds implicit decisions, or when the same question keeps resurfacing.
中文简介正在准备中。当前显示原文说明。
ash1794/vibe-engineering1642026年10月8日 更新