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.

February 23, 2026

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

Change Type	Example	Resolution
Independent	You changed the schema description; they added a new field	Auto-merged, no decision needed
Independent	You moved a diagram shape; they changed a connection's label	Auto-merged, no decision needed
Competing	You renamed a field to "customerId"; they renamed it to "clientId"	Architect must choose one
Competing	You set endpoint method to POST; they set it to PUT	Architect must choose one
Competing	You deprecated an entity; they modified its properties	Architect must choose one

Resolution Interface

Side-by-Side View

Your changes on the left, their changes on the right. Base state shown for context. Each competing property highlighted.

Accept Yours / Accept Theirs

One-click resolution for each competing change. Choose the version that should win.

Auto-Resolve Independent

Non-competing changes are merged automatically. Only competing changes require manual resolution.

Auto-Checkpoint

After all conflicts are resolved, a checkpoint is created automatically with a descriptive merge message.

Supported Resource Types

Conflict resolution works across all NeoArc resource types:

Resource Type	Conflict Granularity
Schemas	Per-field property conflicts
REST Endpoints	Per-parameter and per-response conflicts
Diagram Shapes	Per-property conflicts (text, type, connections)
Graph Nodes	Per-property and per-edge conflicts
Content Pages	Per-block conflicts
Model Entities	Per-property and per-relationship conflicts

Deep Git Integration

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.

Semantic Diff Engine

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.