1<!doctype html>
2<html lang="en">
3<head>
4<meta charset="utf-8">
5<meta name="viewport" content="width=device-width, initial-scale=1">
6<meta name="color-scheme" content="light dark">
7<title>SHA7 merge the side branch · diffs · example.test</title>
8<meta name="theme-color" media="(prefers-color-scheme: light)" content="#ffffff">
9<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#0c0c0c">
10<meta name="apple-mobile-web-app-title" content="ermite">
11<link rel="icon" type="image/svg+xml" href="/-/static/img/icon.HASH.svg">
12<link rel="apple-touch-icon" href="/-/static/app/apple-touch-icon.HASH.png">
13<link rel="manifest" href="/-/static/app/manifest.HASH.webmanifest">
14<link rel="preload" href="/-/static/fonts/atkinson-next.HASH.woff2" as="font" type="font/woff2" crossorigin>
15<link rel="stylesheet" href="/-/static/css/ermite.HASH.css">
16<meta name="htmx-config" content='{"history":false,"includeIndicatorCSS":false,"extensions":"sse, hx-live"}'>
17<script src="/-/static/js/htmx.min.HASH.js" defer>
18</script>
19<script src="/-/static/js/hx-live.min.HASH.js" defer>
20</script>
21<script src="/-/static/js/hx-sse.min.HASH.js" defer>
22</script>
23<script src="/-/static/js/ermite.HASH.js" defer>
24</script>
25<script src="/-/static/js/files.HASH.js" defer>
26</script>
27<script src="/-/static/js/passkey.HASH.js" defer>
28</script>
29<script src="/-/static/js/log.HASH.js" defer>
30</script>
31</head>
32<body data-ref="" data-sha="SHA40" data-sel="" data-nav="" data-paths="/diffs/paths/SHA40" data-blob="/diffs/blob/SHA40">
33<a class="skip" href="#main">skip to content</a>
34<header class="hdr">
35<div class="hdr-top">
36<a class="brand" href="/" data-g="h" aria-label="home" title="home (g h)">
37<span class="brand-mark" aria-hidden="true">
38</span>
39</a>
40<nav class="crumbs" aria-label="Path">
41<ol>
42<li>
43<a href="/diffs">diffs</a>
44</li>
45<li>
46<a href="/diffs/commits/main">commit</a>
47</li>
48<li>
49<span aria-current="page">SHA7</span>
50</li>
51</ol>
52</nav>
53<div class="hdr-acts">
54<a class="btn ref" href="/diffs/refs" data-fire="refs" aria-keyshortcuts="b" title="switch branch or tag (b)">
55<span class="ico i-branch" aria-hidden="true">
56</span>
57<span class="ref-name">detached</span>
58<span class="sha">SHA7</span>
59</a>
60<button type="button" class="btn search" data-js aria-haspopup="dialog" aria-controls="panel-cmd" aria-keyshortcuts="Control+K :" title="go to a section, ref, file or repo (ctrl k or :)" data-fire="cmd">
61<span class="ico i-search" aria-hidden="true">
62</span>
63<span class="search-label">Go to…</span>
64<kbd aria-hidden="true">ctrl k</kbd>
65</button>
66</div>
67</div>
68<nav class="tabs" aria-label="Sections">
69<ul>
70<li>
71<a href="/diffs" data-key="s" aria-keyshortcuts="s">Summary <kbd aria-hidden="true">s</kbd>
72</a>
73</li>
74<li>
75<a href="/diffs/tree/main" data-key="t" aria-keyshortcuts="t">Files <kbd aria-hidden="true">t</kbd>
76</a>
77</li>
78<li>
79<a href="/diffs/commits/main" data-key="c" aria-keyshortcuts="c" aria-current="page">Commits <kbd aria-hidden="true">c</kbd>
80</a>
81</li>
82<li>
83<a href="/diffs/refs" data-key="r" aria-keyshortcuts="r">Branches & tags <kbd aria-hidden="true">r</kbd>
84</a>
85</li>
86<li>
87<a href="/diffs/merge-requests" data-key="m" aria-keyshortcuts="m">Merge requests <kbd aria-hidden="true">m</kbd>
88</a>
89</li>
90<li>
91<a href="/diffs/actions" data-key="a" aria-keyshortcuts="a">Actions <kbd aria-hidden="true">a</kbd>
92</a>
93</li>
94</ul>
95</nav>
96</header>
97<div class="work has-rail">
98<main id="main" tabindex="-1">
99<header class="show">
100<h1>merge the side branch</h1>
101<dl class="kv show-kv">
102<dt>commit</dt>
103<dd>SHA40</dd>
104<dt>author</dt>
105<dd>T · <time datetime="STAMP" title="STAMP">AGO</time> · STAMP</dd>
106<dt>merge of</dt>
107<dd>
108<a href="/diffs/commit/SHA40">SHA7</a> + <a href="/diffs/commit/SHA40">SHA7</a> · diff against the first parent</dd>
109</dl>
110</header>
111<div class="diff-tools" role="toolbar" aria-label="Diff view">
112<span class="dim">1 file · <span class="plus">+1</span>
113<span class="minus">-0</span>
114</span>
115<span class="grow">
116</span>
117<a href="/diffs/commit/SHA40?view=unified" class="btn vbtn" data-view="unified" aria-keyshortcuts="u" aria-current="true" data-fire="unified" :aria-current="q('#diffs').attr['data-diff'] === this.dataset.view ? 'true' : false">Unified<kbd aria-hidden="true">u</kbd>
118</a>
119<a href="/diffs/commit/SHA40?view=split" class="btn vbtn" data-view="split" aria-keyshortcuts="d" data-fire="split" :aria-current="q('#diffs').attr['data-diff'] === this.dataset.view ? 'true' : false">Split<kbd aria-hidden="true">d</kbd>
120</a>
121<button type="button" aria-keyshortcuts="x" data-js data-fire="collapse" class="btn">
122<span hx-live="this.textContent = q('[data-file][open]').count || !q('[data-file]').count ? 'Collapse all' : 'Expand all'">Collapse all</span>
123<kbd aria-hidden="true">x</kbd>
124</button>
125</div>
126<div id="diffs" data-diff="unified" hx-live="this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff">
127<details class="dfile lnw-2" id="f1" data-file open>
128<summary>
129<span class="st">A</span>
130<span class="p">side.txt</span>
131<span class="plus">+1</span>
132<span class="minus">-0</span>
133</summary>
134<div class="dscroll">
135<table class="dt uni" aria-label="side.txt, unified">
136<tbody>
137<tr class="hunk">
138<td colspan="4">@@ -0,0 +1,1 @@</td>
139</tr>
140<tr class="add">
141<td class="ln">
142</td>
143<td class="ln">1</td>
144<td class="m">+</td>
145<td class="tx">from the side</td>
146</tr>
147</tbody>
148</table>
149<table class="dt spl" aria-label="side.txt, split">
150<colgroup>
151<col class="c-ln">
152<col class="c-m">
153<col>
154<col class="c-ln">
155<col class="c-m">
156<col>
157</colgroup>
158<tbody>
159<tr class="hunk">
160<td colspan="6">@@ -0,0 +1,1 @@</td>
161</tr>
162<tr>
163<td class="ln none">
164</td>
165<td class="m none">
166</td>
167<td class="tx none">
168</td>
169<td class="ln add">1</td>
170<td class="m add">+</td>
171<td class="tx add">from the side</td>
172</tr>
173</tbody>
174</table>
175</div>
176</details>
177</div>
178</main>
179<aside class="rail" aria-label="Context">
180<section aria-labelledby="r-files">
181<h2 id="r-files">Files <span class="count">1</span>
182</h2>
183<ol class="files" aria-label="Changed files">
184<li>
185<a href="#f1" title="side.txt" hx-on:click="(window.ermiteMR?.openFile || ermite.openFile)(this.hash.slice(1))">
186<span class="st" data-st="A" title="added">A</span>
187<span class="nm">
188<span class="p">side.txt</span>
189<span class="d">
190<bdi>
191</bdi>
192</span>
193</span>
194<span class="n">
195<span class="plus">+1</span>
196<span class="minus">-0</span>
197</span>
198</a>
199</li>
200</ol>
201</section>
202</aside>
203</div>
204<footer class="foot">
205<span>ermite devel</span>
206<a href="http://example.test/ermite" rel="noopener" title="source of this version (AGPL-3.0-or-later)">source</a>
207<button type="button" class="foot-keys" data-js data-fire="help" aria-haspopup="dialog" aria-controls="panel-help" aria-keyshortcuts="?">
208<kbd aria-hidden="true">?</kbd> keyboard shortcuts</button>
209</footer>
210<div class="hint" role="status" aria-live="polite">
211<span class="hint-nav" :text="document.body.dataset.nav || ''">
212</span>
213<span class="hint-sel" :text="document.body.dataset.sel ? document.body.dataset.sel + ' · y permalink' : ''">
214</span>
215<span class="hint-flash" :text="document.body.dataset.flash || ''">
216</span>
217</div>
218<dialog id="panel-help" class="panel modal" aria-label="Keyboard shortcuts" hx-on:keydown="event.key === 'Escape' && (event.preventDefault(), this.close())" hx-on:click="event.target === this && this.close()">
219<div class="panel-head">
220<h2>Keyboard shortcuts</h2>
221<button type="button" class="panel-x" aria-label="Close" hx-on:click="closest('dialog').close()">
222<kbd>esc</kbd> close</button>
223</div>
224<dl class="keys">
225<div>
226<dt>
227<kbd>ctrl k</kbd>
228<kbd>:</kbd>
229</dt>
230<dd>go to a section, branch, tag, file or repository</dd>
231</div>
232<div>
233<dt>
234<kbd>?</kbd>
235</dt>
236<dd>this list</dd>
237</div>
238<div>
239<dt>
240<kbd>j</kbd>
241<kbd>k</kbd>
242</dt>
243<dd>move the row cursor down / up</dd>
244</div>
245<div>
246<dt>
247<kbd>enter</kbd>
248</dt>
249<dd>open the row under the cursor</dd>
250</div>
251<div>
252<dt>
253<kbd>l</kbd>
254<kbd>h</kbd>
255</dt>
256<dd>into the side panel (on a merge request, its files) / back to the content; there j k move between its controls</dd>
257</div>
258<div>
259<dt>
260<kbd>g g</kbd>
261<kbd>G</kbd>
262</dt>
263<dd>first / last row</dd>
264</div>
265<div>
266<dt>
267<kbd>/</kbd>
268</dt>
269<dd>filter the list; on Files, find a file in the repository</dd>
270</div>
271<div>
272<dt>
273<kbd>b</kbd>
274</dt>
275<dd>switch branch or tag</dd>
276</div>
277<div>
278<dt>
279<kbd>s</kbd>
280<kbd>t</kbd>
281<kbd>c</kbd>
282<kbd>r</kbd>
283<kbd>m</kbd>
284</dt>
285<dd>tabs: summary, files, commits, branches & tags, merge requests</dd>
286</div>
287<div>
288<dt>
289<kbd>g h</kbd>
290</dt>
291<dd>home</dd>
292</div>
293<div>
294<dt>
295<kbd>y</kbd>
296</dt>
297<dd>copy a permalink pinned to the commit</dd>
298</div>
299<div>
300<dt>
301<kbd>d</kbd>
302<kbd>u</kbd>
303<kbd>x</kbd>
304</dt>
305<dd>diff: split / unified / collapse or expand all</dd>
306</div>
307<div>
308<dt>
309<kbd>e</kbd>
310<kbd>E</kbd>
311</dt>
312<dd>diff: the whole file in view / every file, with the lines the hunks hide</dd>
313</div>
314<div>
315<dt>
316<kbd>n</kbd>
317</dt>
318<dd>merge request: next note in the diff</dd>
319</div>
320<div>
321<dt>
322<kbd>esc</kbd>
323</dt>
324<dd>close a dialog, leave a field</dd>
325</div>
326</dl>
327</dialog>
328<dialog id="panel-refs" class="panel modal" aria-label="Switch ref" hx-on:keydown="event.key === 'Escape' && (event.preventDefault(), this.close())" hx-on:click="event.target === this && this.close()">
329<div class="panel-head">
330<label for="refs-filter" class="sr">filter branches and tags</label>
331<input id="refs-filter" type="search" placeholder="Switch branch or tag…" autocomplete="off" data-pick="#panel-refs li" hx-on:input="ermite.filter(this)">
332<button type="button" class="panel-x" aria-label="Close" hx-on:click="closest('dialog').close()">
333<kbd>esc</kbd>
334</button>
335</div>
336<div class="panel-cols" data-picklist>
337<section aria-label="Branches">
338<h2>Branches <span class="count">2</span>
339</h2>
340<ul>
341<li>
342<a href="/diffs/tree/main">
343<span class="mark" aria-hidden="true"> </span>main</a>
344</li>
345<li>
346<a href="/diffs/tree/side">
347<span class="mark" aria-hidden="true"> </span>side</a>
348</li>
349</ul>
350</section>
351<section aria-label="Tags">
352<h2>Tags <span class="count">1</span>
353</h2>
354<ul>
355<li>
356<a href="/diffs/tree/v1.0.0">
357<span class="mark" aria-hidden="true"> </span>v1.0.0</a>
358</li>
359</ul>
360</section>
361</div>
362</dialog>
363<dialog id="panel-cmd" class="panel modal" aria-label="Go to" hx-on:close="ermiteFinder.paletteClose()" hx-on:keydown="event.key === 'Escape' && (event.preventDefault(), this.close())" hx-on:click="event.target === this && this.close()">
364<div class="panel-head">
365<label for="cmd-q" class="sr">go to</label>
366<input id="cmd-q" type="search" placeholder="Go to a section, branch, tag, file or repository…" autocomplete="off" spellcheck="false" aria-controls="cmd-list" hx-on:input="ermite.cmdFilter(this); ermiteFinder.palette(this)" hx-on:keydown="ermite.cmdKey(event)">
367<button type="button" class="panel-x" aria-label="Close" hx-on:click="closest('dialog').close()">
368<kbd>esc</kbd>
369</button>
370</div>
371<ul id="cmd-list" class="cmd-list" aria-label="Targets">
372<li data-k="go home" data-cursor>
373<a href="/" tabindex="-1">
374<span class="lbl">home</span>
375<span class="k">go</span>
376</a>
377</li>
378<li data-k="section summary">
379<a href="/diffs" tabindex="-1">
380<span class="lbl">summary</span>
381<span class="k">section</span>
382</a>
383</li>
384<li data-k="section files">
385<a href="/diffs/tree/main" tabindex="-1">
386<span class="lbl">files</span>
387<span class="k">section</span>
388</a>
389</li>
390<li data-k="section commits">
391<a href="/diffs/commits/main" tabindex="-1">
392<span class="lbl">commits</span>
393<span class="k">section</span>
394</a>
395</li>
396<li data-k="section branches & tags">
397<a href="/diffs/refs" tabindex="-1">
398<span class="lbl">branches & tags</span>
399<span class="k">section</span>
400</a>
401</li>
402<li data-k="section merge requests">
403<a href="/diffs/merge-requests" tabindex="-1">
404<span class="lbl">merge requests</span>
405<span class="k">section</span>
406</a>
407</li>
408<li data-k="section actions">
409<a href="/diffs/actions" tabindex="-1">
410<span class="lbl">actions</span>
411<span class="k">section</span>
412</a>
413</li>
414<li data-k="branch main">
415<a href="/diffs/tree/main" tabindex="-1">
416<span class="lbl">main</span>
417<span class="k">branch</span>
418</a>
419</li>
420<li data-k="branch side">
421<a href="/diffs/tree/side" tabindex="-1">
422<span class="lbl">side</span>
423<span class="k">branch</span>
424</a>
425</li>
426<li data-k="tag v1.0.0">
427<a href="/diffs/tree/v1.0.0" tabindex="-1">
428<span class="lbl">v1.0.0</span>
429<span class="k">tag</span>
430</a>
431</li>
432</ul>
433<p class="panel-foot">
434<span>
435<kbd>↑</kbd>
436<kbd>↓</kbd> move</span>
437<span>
438<kbd>enter</kbd> open</span>
439<span>
440<kbd>esc</kbd> close</span>
441</p>
442</dialog>
443<div id="keys" hidden hx-on="k-j from:body -> ermite.move(1);
444 k-k from:body -> ermite.move(-1);
445 k-top from:body -> ermite.edge(false);
446 k-bottom from:body -> ermite.edge(true);
447 k-open from:body -> ermite.open();
448 k-right from:body -> ermite.rail(true);
449 k-left from:body -> ermite.rail(false);
450 k-esc from:body -> ermite.closeDialogs();
451 k-help from:body -> ermite.dialog('panel-help');
452 k-refs from:body -> ermite.dialog('panel-refs', 'refs-filter');
453 k-cmd from:body -> ermite.dialog('panel-cmd', 'cmd-q'); ermiteFinder.load();
454 k-filter from:body -> ermite.focusFilter();
455 k-gh from:body -> ermite.go('.brand');
456 k-s from:body -> ermite.tab('s');
457 k-t from:body -> ermite.tab('t');
458 k-c from:body -> ermite.tab('c');
459 k-r from:body -> ermite.tab('r');
460 k-m from:body -> ermite.tab('m');
461 k-next from:body -> ermite.nextNote();
462 k-split from:body -> ermite.layout('split');
463 k-unified from:body -> ermite.layout('unified');
464 k-collapse from:body -> ermite.collapse();
465 k-expand from:body -> ermite.expandFile();
466 k-expandAll from:body -> ermite.expandAll();
467 k-permalink from:body -> ermite.permalink();
468 k-merge from:body -> window.ermiteMR?.openMerge();
469 k-read from:body -> window.ermiteMR?.markRead();
470 k-gf from:body -> window.ermiteMR?.focusFiles()">
471</div>
472</body>
473</html>