{% extends "default.html" %} {% block title %} {% trans result_id=result.id %}Task monitor for {{ result_id }}{% endtrans %} {% endblock %} {% block breadcrumbs %}
{{ result.get()[1] | decode }}{% endif %} {% if result.get()[2] %}
{{ result.get()[2] | decode }}{% endif %} {% if result.get()[7] %}
{% trans %}Since we can't help you with this yet, you'll need to resolve the merge conflicts on your own computer.{% endtrans %}
{% trans %}In a shell inside your repository execute:{% endtrans %}
{% if result.get()[3] != result.get()[5] %}{% trans %}git remote add UPSTREAM {{ result.get()[3] }}{% endtrans %} {% trans %}git remote update{% endtrans %} {% trans %}git checkout {{ result.get()[6] }}{% endtrans %} {% trans %}git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}{% endtrans %}
{% trans %}Then fix your conflicts, merge, and finally, run:{% endtrans %}
{% trans %}git remote rm UPSTREAM{% endtrans %}
{% trans %}and push the changes.{% endtrans %}
{% else %}{% trans %}git checkout {{ result.get()[6] }}{% endtrans %} {% trans %}git merge {{ result.get()[4] }}{% endtrans %}
{% trans %}Resolve your conflicts and merge, then push.{% endtrans %}
{% endif %} {% else %}