Merge queue
Skill a5c-ai/babysitter/library/methodologies/gastown/skills/merge-queue
Process the Refinery merge queue - collect agent work, detect and resolve conflicts, merge in dependency order, and verify integration.From its SKILL.md
npx -y skills add a5c-ai/babysitter --skill merge-queueAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
SKILL.md
1.2 KB, 157 tokens by cl100k_base, as published. Nobody here has run it
- When multiple agents have worked on overlapping areas
- When integration testing is needed before landing
- When conflict resolution requires coordination
Process
- Collect pending changes from all agent branches
- Detect conflicts between branches and target
- Resolve conflicts (auto-resolve where possible)
- Merge in dependency order with attribution
- 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
What ships with it: 1 file
566 B alongside SKILL.md
- README.md566 B