{% extends "default.html" %} {% block title %} {% trans result_id=result.id %}Task monitor for {{ result_id }}{% endtrans %} {% endblock %} {% block breadcrumbs %}
  • {% trans result_id=result.id %}Task {{ result_id }}{% endtrans %}
  • {% endblock %} {% block content %} {# Update every 5 seconds #}

    {% trans %}Task results{% endtrans %}

    {% if result.ready() %} {% trans %}Done{% endtrans %} {% else %} {% trans %}Running...{% endtrans %} {% endif %}
    {% if result.get()[0] == "merge_simulator" %} {% if result.get()[1] %}

    {% trans %}Info{% endtrans %}

    {{ result.get()[1] | decode }}
    {% endif %} {% if result.get()[2] %}

    {% trans %}Errors{% endtrans %}

    {{ result.get()[2] | decode }}
    {% endif %} {% if result.get()[7] %}

    {% trans %}Cannot merge your branches{% endtrans %}

    {% 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] %}
    git remote add UPSTREAM {{ result.get()[3] }}
    git remote update
    git checkout {{ result.get()[6] }}
    git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}

    {% trans %}Then fix your conflicts, merge, and finally, run:{% endtrans %}

    git remote rm UPSTREAM

    {% trans %}and push the changes.{% endtrans %}

    {% else %}
    git checkout {{ result.get()[6] }}
    git merge {{ result.get()[4] }}

    {% trans %}Resolve your conflicts and merge, then push.{% endtrans %}

    {% endif %} {% else %}

    {% trans %}Merge simulation went well; continue?{% endtrans %}

    {% trans %}Merge{% endtrans %} {% endif %} {% endif %}
    {% endblock %}