merge-queue
The merge-queue skill processes completed agent work by collecting pending changes, detecting conflicts between overlapping branches, auto-resolving where possible, and merging in dependency order before verifying integration through tests and builds. Use this when multiple agents finish work on related code areas and changes need coordinated integration before landing to the target branch.
git clone --depth 1 https://github.com/a5c-ai/babysitter /tmp/merge-queue && cp -r /tmp/merge-queue/library/methodologies/gastown/skills/merge-queue ~/.claude/skills/merge-queueSKILL.md
- When multiple agents have worked on overlapping areas - When integration testing is needed before landing - When conflict resolution requires coordination ## Process 1. **Collect** pending changes from all agent branches 2. **Detect** conflicts between branches and target 3. **Resolve** conflicts (auto-resolve where possible) 4. **Merge** in dependency order with attribution 5. **Verify** integration (tests, lint, build) ## Conflict Strategies - **auto**: Attempt automatic resolution, escalate on failure - **manual**: Always require human review - **theirs**: Prefer incoming changes - **ours**: Prefer target branch changes ## Tool Use Invoke via babysitter process: `methodologies/gastown/gastown-merge-queue`
Review TypeScript code changes for consistency, type safety, and monorepo patterns across babysitter packages
Generate and validate documentation for @a5c-ai/babysitter-sdk CLI commands and exported APIs
Scaffold new babysitter process definitions following SDK patterns, proper structure, and best practices. Guides the 3-phase workflow from research to implementation.