{% extends 'generic/_base.html' %} {% load form_helpers %} {% load i18n %} {% block title %}{% trans action %} {{ branch }}{% endblock %} {% block tabs %} {% endblock tabs %} {% block content %} {# Form tab #}
{% if conflicts_table.rows %}
{% blocktrans with count=conflicts_table.rows|length %} The following {{ count }} conflicts were found. Applying these changes will overwrite data that has been modified since the branch was created. Please confirm that each of these changes is desired. {% endblocktrans %}
{% else %}
{% trans "No conflicts found." %}
{% endif %}
{% csrf_token %} {% if conflicts_table.rows %}
{% include 'htmx/table.html' with table=conflicts_table %}
{% endif %}
{% render_field form.commit %}
{% trans "Cancel" %}
{# /Form tab #} {% endblock content %}