{% extends "base.html" %} {% block title %}IDR Conflicts — {{ session.title }} — ICDEV™{% endblock %} {% block content %}
CUI // SP-CTI
← Back to Session

⚠ Conflict Resolution — {{ session.title }}

AI flagged topology discrepancies across your team's diagrams. Review each conflict and pick the canonical version.

{{ pending_conflicts|length }}
pending
{% if pending_conflicts %}
⚠ {{ pending_conflicts|length }} unresolved — this session cannot advance past Stage 3 until all conflicts are resolved.
{% else %}
✅ All conflicts resolved — you may advance to Stage 4 (Synthesis). ← Return to session
{% endif %} {% if pending_conflicts %}

Pending Resolution ({{ pending_conflicts|length }})

{% for c in pending_conflicts %}
{{ c.node_label }} {{ c.conflict_type }}
{{ c.created_at[:19] if c.created_at else '' }}
Source A
{{ c.source_a }}
{{ c.source_a_value or '—' }}
Source B
{{ c.source_b }}
{{ c.source_b_value or '—' }}
{% endfor %} {% endif %} {% if resolved_conflicts %}

Resolved ({{ resolved_conflicts|length }})

{% for c in resolved_conflicts %}
{{ c.node_label }} {{ c.conflict_type }} → {{ c.resolution }} {% if c.resolution_notes %} ({{ c.resolution_notes }}) {% endif %}
{{ c.resolved_by }} · {{ c.resolved_at[:16] if c.resolved_at else '' }}
{% endfor %}
{% endif %} {% endblock %}