{% extends "default.html" %} {% block title %} Task monitor for {{ result.id }} {% endblock %} {% block breadcrumbs %}
{{ result.get()[1] | decode }}{% endif %} {% if result.get()[2] %}
{{ result.get()[2] | decode }}{% endif %} {% if result.get()[7] %}
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 %}