merge-queue

Enqueue and process feature merges using per-branch FIFO queues and worktrees.

Updated Mar 26, 2026
One-click install
npx skills add https://github.com/assafYavnai/ADF-V1 --skill merge-queue-assafyavnai
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: merge-queue
Source: https://github.com/assafYavnai/ADF-V1/tree/main/skills/merge-queue
Command: npx skills add https://github.com/assafYavnai/ADF-V1 --skill merge-queue-assafyavnai

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires governed-feature-runtime, and includes scripts (resource) and references (resource) components.

What problem does it solve?

Enforces a reliable, auditable workflow for enqueuing and merging approved feature changes by organizing merges into per-base-branch queues and landing them in isolated worktrees, with truthful conflict reporting and handoff back into implement-plan state.

Core Features & Use Cases

  • FIFO queueing of merge requests per base branch with isolated merge worktrees for safe landings.
  • Enqueue approved feature merges, process next merge, and resume blocked merges with validation and blocker-aware recovery.
  • Updates to implement-plan state reflect current merge status and provide end-to-end traceability.

Quick Start

Provide an approved commit SHA and a target branch to enqueue a merge, then run process-next to perform the merge.

Frequently Asked Questions about merge-queue

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automate queuing and landing approved feature merges deterministically?

Automating approved feature merges involves organizing them into per-base-branch FIFO queues and landing them in isolated merge worktrees. This ensures safe, auditable landings by processing merges sequentially and validating conflicts before finalizing.

What is the best way to handle merge conflicts when automating branch landings?

Handling merge conflicts during automated landings requires truthful conflict reporting within isolated worktrees. The system identifies blockers during the merge process and provides recovery mechanisms to resume blocked merges after validation.

Do I need a governed feature runtime to use a merge queue?

Yes, a governed feature runtime is required as a dependency. It provides the necessary environment for executing automated merge pipelines, ensuring that feature state synchronization and handoff to implement-plan state are managed durably.

Can I resume a blocked merge request after fixing conflicts in the worktree?

Yes, blocked merge requests can be resumed. The queue processing logic includes blocker-aware recovery, allowing you to process the next merge or retry a previously blocked one after performing validation and resolving the reported conflicts.

How does an isolated merge worktree improve branch management?

Isolated merge worktrees improve branch management by creating dedicated environments for each merge operation. This prevents concurrent merge operations from interfering with each other, ensuring safe landings and accurate conflict detection.

Why do I need state synchronization after landing an approved commit?

State synchronization after landing an approved commit provides end-to-end traceability. It updates the implement-plan state to reflect the current merge status, ensuring the feature pipeline has a durable handoff and accurate closeout readiness checks.