hegemonart

Conflict Resolver

Name: Conflict Resolver
Author: hegemonart

Design community

SOURCE https://github.com/hegemonart/ultimate-design/blob/main/agents/conflict-resolver.md

Description

--- name: conflict-resolver description: Resolves design-artifact merge conflicts when two developers worked a cycle on parallel branches. Reads the conflicted STATE.md from both sides (ours/theirs) plus the merge base, runs the pure scripts/lib/collab/section-merge.cjs per-section semantic merge (union the <decisions> by D-id; a real conflict is only a same-id divergence), and proposes a resolution PER SECTION for explicit human confirmation. Never auto-commits a conflicted section - decisions

Installation

Installs to ~/.claude/agents/hegemonart-ultimate-design-conflict-resolver.md

Terminal

mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/hegemonart/ultimate-design/HEAD/agents/conflict-resolver.md -o ~/.claude/agents/hegemonart-ultimate-design-conflict-resolver.md

Restart Claude Code, or start a new session, for it to be picked up.