fd958fbc Andy McCall 1 month ago ↶
1
{% extends "base.html" %}
2
{% import "repo_tabs.html" as m %}
3
{% block title %}Resolve {{ path }} · {{ repo.owner }}/{{ repo.name }}{% endblock %}
4
{% block bodyattrs %} data-repo="{{ repo.url }}"{% endblock %}
5
{% block tabs %}{% call m::tabs(repo, "conflicts") %}{% endblock %}
6
{% block mainclass %} class="wide"{% endblock %}
7
{% block content %}
8
< div class = " head " > < h1 > Resolve < code > {{ path }}</ code > < small > on < span class = " lbl lbl-bm " > {{ bookmark }}</ span > </ small > </ h1 >
9
< p class = " small mute " > {{ candidates.len() }} files want this name, so the tree shows them as < code > {{ path }}.oxy-conflict-N</ code > . Keep one: it takes the name, keeping its history, and the others are removed. The commit is a resolution change on {{ bookmark }}.</ p > </ div >
16cb2b3a Andy McCall 1 month ago ↶
10
< p class = " small " > < a href = " {{ vscode }}" > Resolve in VS Code</ a > < span class = " mute " > (with the Oxygen extension: it opens your checkout on {{ bookmark }}, or offers to clone it)</ span > </ p >
fd958fbc Andy McCall 1 month ago ↶
11
{% if let Some(e) = error %}< p class = " error " > {{ e }}</ p > {% endif %}
12
{% if let Some(d) = delegation %}< p class = " error " > {{ d }}</ p > {% endif %}
13
< form method = " post" action = " {{ repo.url }}/resolve/{{ bookmark }}/{{ path }}" >
14
< input type = " hidden" name = " _csrf" value = " {{ shell.csrf }}" >
15
< input type = " hidden" name = " state" value = " {{ state }}" >
16
{% for c in candidates %}
17
< section class = " file-diff " id = " candidate-{{ loop.index }} " >
18
< header > < label > < input type = " radio" name = " keep" value = " {{ loop.index0 }}" {% if loop.first %} checked {% endif %}> keep < strong > {{ c.path }}</ strong > </ label > < a class = " small " href = " {{ repo.url }}/file/{{ bookmark }}/{{ c.path }}" > view</ a > </ header >
19
{% if let Some(p) = c.preview %}< pre class = " marked " > {{ p }}</ pre > {% else %}< p class = " small mute " > binary, {{ c.content.len() }} bytes</ p > {% endif %}
20
</ section >
21
{% endfor %}
22
< label for = " message" > Message</ label > < input type = " text" id = " message " name = " message" value = " {{ message }}" >
23
< button type = " submit" > COMMIT RESOLUTION</ button >
24
</ form >
25
{% endblock %}