{% extends "base.html" %} {% block title %}Conflicts - {% if current_project == all_projects_value %}All Projects{% else %}{{ current_project|display_name }}{% endif %} - CodeContext{% endblock %} {% block content %}

Conflict Resolution{% if current_project == all_projects_value %} - All Projects{% endif %}

{{ pending_count }}
Pending
{{ conflicts|length if conflicts else 0 }}
Showing
{{ resolved_count|default(0) }}
Resolved
{{ info.device|upper if info else 'CPU' }}
Device
Pending {% if pending_count > 0 %} {{ pending_count }} {% endif %} Resolved All
Auto-Resolve
{% if pending_count > 0 %} {% endif %}
{% if conflicts %} {% for c in conflicts %}
{{ c.conflict_status|upper }} {% if current_project == all_projects_value %} {{ c.project|display_name }} {% endif %} {% if c.confidence %} {% if c.confidence == 'auto' %}⚡ Auto{% elif c.confidence == 'high' %}🎯 High{% elif c.confidence == 'medium' %}📊 Medium{% else %}🔍 Low{% endif %} {% endif %} {% if c.distance %} 📏 {{ '%.2f'|format(c.distance) }} {% endif %} {% if c.detected_at %} Detected: {{ c.formatted_date }} {% endif %}
NEW {{ c.type }} {{ c.formatted_date if c.formatted_date else '' }}

{{ c.title }}

{{ c.fact }}

{% if c.files %}
{% for f in c.files %} {{ f }} {% endfor %}
{% endif %}
vs
{% if c.conflict_with %}
EXISTING {{ c.conflict_with.type }} {{ c.conflict_with.formatted_date if c.conflict_with.formatted_date else '' }}

{{ c.conflict_with.title }}

{{ c.conflict_with.fact }}

{% if c.conflict_with.files %}
{% for f in c.conflict_with.files %} {{ f }} {% endfor %}
{% endif %} {% else %}

Original memory not found (may have been deleted)

{% endif %}
{% if c.conflict_status == 'resolved' %}
Resolution: {{ c.conflict_resolution or 'N/A' }}
{% endif %}
{% endfor %} {% else %}
{% if current_status == 'pending' %}

No pending conflicts. All memories are consistent!

{% elif current_status == 'resolved' %}

No resolved conflicts yet.

{% else %}

No conflicts found.

{% endif %}
{% endif %}
{% endblock %}