본문으로 건너뛰기
cccskills
무료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(원문)

설치하기 전에 에이전트에게 전달되는 지시 내용을 확인할 수 있습니다.

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

리뷰

아직 리뷰가 없습니다. 사용해 본 소감을 남겨 주세요.

댓글

로그인 없이 쓸 수 있습니다. 사용 후기, 질문, 작동하지 않은 환경 등을 편하게 남겨 주세요.

아직 댓글이 없습니다. 첫 댓글을 남겨 보세요.

보내면 바로 공개됩니다. 이메일 주소나 전화번호 같은 개인 정보는 쓰지 마세요. URL은 2개까지입니다.

0 / 1,000자

이 양식은 reCAPTCHA로 보호되며 Google 개인정보처리방침 및 서비스 약관이 적용됩니다.

같은 저장소의 스킬

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일 업데이트

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일 업데이트

ash1794의 스킬 모두 보기

이 스킬의 문제 신고