Align default-branch wording and question guidance

This commit is contained in:
Ian Gulliver
2026-10-21 09:06:43 -07:00
parent a977c3cad9
commit 0058e66b54
6 changed files with 11 additions and 12 deletions
+4 -4
View File
@@ -1252,7 +1252,7 @@ footer {
</details></li>
<li><details name="feature">
<summary><h3>One-click merge</h3><p>The agent merges main in and resolves conflicts, then byre squashes, pushes and closes the task.</p><span class="more"></span></summary>
<summary><h3>One-click merge</h3><p>The agent merges the default branch in and resolves conflicts, then byre squashes, pushes and closes the task.</p><span class="more"></span></summary>
<div class="detail">
<div class="fig split squash" aria-hidden="true">
<div class="win ready">
@@ -1277,12 +1277,12 @@ footer {
<circle class="turn" cx="207" cy="30" r="4"/>
<circle class="new" cx="260" cy="95" r="9"/>
</svg>
<div class="legend"><span>5 turns on byre/avatars</span><span><b>1 commit on main</b></span></div>
<div class="legend"><span>5 turns on byre/avatars</span><span><b>1 commit on the default branch</b></span></div>
</div>
</div>
<ul class="points">
<li><strong>Conflicts handled.</strong> The agent merges main in and works through any conflicts.</li>
<li><strong>One clean commit.</strong> The whole task lands on main as a single squashed commit.</li>
<li><strong>Conflicts handled.</strong> The agent merges the default branch in and works through any conflicts.</li>
<li><strong>One clean commit.</strong> The whole task lands on the default branch as a single squashed commit.</li>
<li><strong>Then it's done.</strong> byre pushes and closes the task, so your list stays short.</li>
</ul>
</div>