merge-queue
Process the Refinery merge queue - collect agent work, detect and resolve conflicts, merge in dependency order, and verify integration.
npx skills add a5c-ai/babysitter --skill merge-queue --agent claude-code
Same command for any agent — swap --agent for codex, cursor, copilot.
Weekly change comes from our own snapshots, not the repository page — it measures attention, not adoption.
- 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`
- Process
- Conflict Strategies
- Tool Use
What does the merge-queue skill do?
Process the Refinery merge queue - collect agent work, detect and resolve conflicts, merge in dependency order, and verify integration.
How do I install it?
Run `npx skills add a5c-ai/babysitter --skill merge-queue --agent claude-code` — it drops the skill into your project so the agent can pick it up. Swap the --agent value for codex, cursor or copilot if you use one of those.
Where does this skill come from?
From a5c-ai/babysitter, a repository with 1,642 stars. We read it straight from the repository tree rather than a submitted listing, so what you see here is what is actually published.
Is a popular skill a good skill?
Not necessarily. Stars measure attention, not adoption — a repository can trend for a week and be abandoned. That is why we show the weekly change from our own snapshots next to the total, instead of a single flattering number.