{% extends "base.html" %} {% block title %}Conflicts - {% if current_project == all_projects_value %}All Projects{% else %}{{ current_project|display_name }}{% endif %} - CodeContext{% endblock %} {% block content %}
{{ c.fact }}
{% if c.files %}{{ f }}
{% endfor %}
{{ c.conflict_with.fact }}
{% if c.conflict_with.files %}{{ f }}
{% endfor %}
Original memory not found (may have been deleted)
No pending conflicts. All memories are consistent!
{% elif current_status == 'resolved' %}No resolved conflicts yet.
{% else %}No conflicts found.
{% endif %}