Conflict Detector Skill
Detection Methods
Pre-Write Check
Before every write_file or replace:
bash
git status --porcelain "$FILE" # If non-empty AND file not in your scope → CONFLICT
During-Write Check
After writing, verify no race condition:
bash
git diff HEAD -- "$FILE" # If unexpected changes → signal_conflict
Conflict Response
On detecting any conflict:
- •STOP current operation
- •Call MCP:
signal_conflict(file, type, details) - •WAIT for orchestrator response
- •Do NOT attempt auto-resolution
Conflict Types
| Type | Detection | Auto-Resolvable |
|---|---|---|
| Additive | Both workers added to same file | Maybe |
| Semantic | Same function modified differently | No |
| Destructive | One deleted what other modified | No |