{% extends "base.html" %} {% import "repo_tabs.html" as m %} {% block title %}Resolve {{ path }} ยท {{ repo.owner }}/{{ repo.name }}{% endblock %} {% block bodyattrs %} data-repo="{{ repo.url }}"{% endblock %} {% block tabs %}{% call m::tabs(repo, "conflicts") %}{% endblock %} {% block mainclass %} class="wide"{% endblock %} {% block content %}

Resolve {{ path }} on {{ bookmark }}

{% if versions %}

Changes that did not know of each other each replaced this file, so it has {{ candidates.len() }} versions. Keep one: the commit is a resolution change on {{ bookmark }} that replaces every version with it.

{% else %}

{{ candidates.len() }} files want this name, so the tree shows them as {{ path }}.oxy-conflict-N. Keep one: it takes the name, keeping its history, and the others are removed. The commit is a resolution change on {{ bookmark }}.

{% endif %}

Resolve in VS Code (with the Oxygen extension: it opens your checkout on {{ bookmark }}, or offers to clone it)

{% if let Some(e) = error %}

{{ e }}

{% endif %} {% if let Some(d) = delegation %}

{{ d }}

{% endif %}
{% for c in candidates %}
{% if !versions %} view{% endif %}
{% if let Some(p) = c.preview %}
{{ p }}
{% else %}

binary, {{ c.content.len() }} bytes

{% endif %}
{% endfor %}
{% endblock %}