{% load i18n %}

<p>{% translate "Weblate could not merge upstream changes while updating the repository." %}</p>

{% if analysis.redirect %}
  {% include "trans/alert/common-repo.html" %}
{% else %}
  <pre>{{ error }}</pre>

  {% include "trans/merge_instructions.html" %}
{% endif %}