{% extends "default.html" %} {% block title %} Task monitor for {{ result.id }} {% endblock %} {% block breadcrumbs %}
  • Task {{ result.id }}
    • {% endblock %} {% block content %}

    Task results

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

    Info

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

    Errors

    {{ result.get()[2] | decode }}
    {% endif %} {% if result.get()[1] or result.get()[2] and not result.get()[2].decode().startswith("Automatic merge went well") %}

    Cannot merge your branches :/

    Since we can't help you with this yet, you'll need to resolve the merge conflicts on your own computer.

    In a shell inside your repository execute:

    {% 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] }}

    Then fix your conflicts, merge, and finally, run: 

    git remote rm UPSTREAM

    and push the changes.

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

    Resolve your conflicts and merge, then push.

    {% endif %} {% else %}

    Merge simulation went well; continue?

    Merge {% endif %} {% endif %}     {% endblock %}