Conflict Resolution for Architects
When merge conflicts occur, NeoArc presents them as architectural choices rather than raw JSON diffs. A three-way merge GUI with Accept Yours and Accept Theirs buttons makes conflict resolution meaningful.
When two architects modify the same resource on different tracks, a merge conflict occurs. Standard Git presents these as raw JSON line conflicts. NeoArc's conflict resolution GUI analyses the three-way merge (base, yours, theirs) and presents conflicts as architectural choices with clear context.
How It Works
Independent vs Competing Changes
Resolution Interface
Supported Resource Types
Conflict resolution works across all NeoArc resource types:
NeoArc wraps Git with architecture-first concepts: checkpoints instead of commits, tracks instead of branches, baselines instead of tags. Semantic diff, conflict resolution, drift analytics, and shelving provide a complete governance workflow.
NeoArc analyses changes as architectural decisions, not line-level diffs. Every change is classified as structural or cosmetic, giving architects a meaningful view of what actually matters.