multi-agent-conflict

Detect and prevent concurrent agent conflicts across git worktrees and sessions.

1|Updated Jan 11, 2026
One-click install
npx skills add https://github.com/martiendejong/autonomous-dev-system --skill multi-agent-conflict
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: multi-agent-conflict
Source: https://github.com/martiendejong/autonomous-dev-system/tree/main/.claude/skills/multi-agent-conflict
Command: npx skills add https://github.com/martiendejong/autonomous-dev-system --skill multi-agent-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Detects and prevents conflicts when multiple Claude agents run concurrently, ensuring safe pre-allocation checks before worktree use.

Core Features & Use Cases

  • Pre-allocation conflict checks across git worktrees, active sessions, and worktree pools.
  • Mandatory, actionable conflict responses that stop allocation when conflicts are detected.
  • Recovery guidance for stale worktrees and shared workspaces to maintain integrity.

Quick Start

Run the conflict-detection workflow before allocating any worktree to ensure no other agent is using the branch.

Frequently Asked Questions about multi-agent-conflict

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

FAQPage Schema
How do I prevent concurrent Claude agents from colliding on the same git branch?

To prevent agent conflicts on the same branch, enforce pre-allocation conflict checks across git worktrees, active sessions, and worktree pools before allocating any new work to ensure safe coordination. It aborts allocation on conflict and provides auditable recovery procedures.

What is pre-allocation conflict detection for git worktrees?

Pre-allocation conflict detection is a safety mechanism that coordinates git worktrees, agent sessions, and pool status to verify no other concurrent agent is actively using a target branch before work begins.

How do I recover stale worktrees when multiple agents share the same workspace?

To recover stale worktrees and maintain shared workspace integrity, follow the built-in recovery guidance which provides actionable procedures to safely clean up abandoned worktrees and reset pool status.

Does this conflict detection skill support abort-on-conflict workflows for agent automation?

Yes, this skill satisfies the requirement for mandatory abort-on-conflict workflows by stopping worktree allocation immediately when a conflict is detected, preventing concurrent agents from overwriting each other's work.

Do I need git worktree pools to use this branch conflict prevention skill?

Git worktrees are the core mechanism used for allocation checks. This skill applies to any automation workflow where multiple agents may allocate worktrees across repositories, branches, or seats, requiring pool status coordination.