{% include "head.html" %}
Resolve
{% if conflict %}
Resolve Conflict
{{ status }}
Accept:
Base
Working
Mine-Conflict
Theirs-Conflict
Mine-Full
Theirs-Full
[Documentation]
[Revert]
[Static]
[Diff]
[Edit]
[Browse]
{% else %}
Can't resolve this resource as it doesn't appear to be in a conflicted state.
[Edit]
[Browse]
{% endif %}