merge-queue

Concurrent git merge failures are prevented by acquiring an atomic lock that serializes agent branch merges into a protected master, ensuring only one merge executes at a time. This shared lock stops race conditions and overwrites when multiple branches merge simultaneously.

A non-fast-forward merge policy uses the `--no-ff` git flag to always create a merge commit, preserving task-level history. In multi-agent workflows, this makes merges auditable by clearly distinguishing which agent branch introduced specific changes into master.

Yes, you can resume partially completed merges safely using idempotency checks. This ensures that failed or interrupted merge processes can be retried without duplicating commits or corrupting the branch history in the protected master repository.

Automated worktree and branch cleanup deletes task worktrees and remote branches after a successful merge completes. This prevents disk bloat and removes obsolete agent branches once their changes have been serialized and merged into the protected master.

The best way to serialize overlapping branch merges is by using a merge queue that enforces atomic locking and sequential processing. This prevents hidden conflicts and race-condition failures when multiple agents attempt to merge changes simultaneously.