OXYGENHUB
# 076c7a7c86b1 oxygenhub / templates / resolve_name.html
2.4 KiB · HTML · last changed Resolve conflicts together, live 1 month ago source blame history raw
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
{% if versions %}<p class="small mute">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.</p>{% else %}<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>{% endif %}</div>
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>
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
<p class="small" data-live-present hidden></p>
14
<div class="strip" data-live-landed hidden></div>
15
<form method="post" action="{{ repo.url }}/resolve/{{ bookmark }}/{{ path }}" data-resolve-live="{{ repo.url }}/resolve-live/{{ bookmark }}/{{ path }}" data-csrf="{{ shell.csrf }}">
16
<input type="hidden" name="_csrf" value="{{ shell.csrf }}">
17
<input type="hidden" name="state" value="{{ state }}">
18
{% for c in candidates %}
19
<section class="file-diff" id="candidate-{{ loop.index }}">
20
  <header><label><input type="radio" name="keep" value="{{ loop.index0 }}"{% if loop.first %} checked{% endif %}> keep <strong>{{ c.path }}</strong></label>{% if !versions %} <a class="small" href="{{ repo.url }}/file/{{ bookmark }}/{{ c.path }}">view</a>{% endif %}</header>
21
  {% if let Some(p) = c.preview %}<pre class="marked">{{ p }}</pre>{% else %}<p class="small mute">binary, {{ c.content.len() }} bytes</p>{% endif %}
22
</section>
23
{% endfor %}
24
<label for="message">Message</label><input type="text" id="message" name="message" value="{{ message }}">
25
<button type="submit">COMMIT RESOLUTION</button>
26
</form>
27
{% endblock %}