feat(conflict-resolution): add conflict resolution mechanisms (Issue #414)#433

Merged

zaxbysauce merged 8 commits intomainfrom

claude/implement-swarm-NuzcJ

Apr 8, 2026

Commits on Apr 7, 2026

feat(conflict-resolution): add conflict resolution mechanisms (Issue #414)
claude
committed
fix(conflict-resolution): address critic findings from Issue #414 review
claude
committed

Commits on Apr 8, 2026

chore(conflict-resolution): add release notes and fix biome formatting
claude
committed
build: regenerate dist declarations and bundles for v6.55.0
claude
committed
chore: ignore Windows-path test artifact directories
claude
committed
feat(wiring): live-wire conflict resolution into reviewer and sounding-board paths (Issue #414)
claude
committed
fix(wiring): address adversarial critic findings in conflict-resolution wiring (Issue #414)
claude
committed
fix(review): address PR review findings — file paths, comment precision, release notes
claude
committed