From b1a05da18c97ec118bf741355592950cdd159ed5 Mon Sep 17 00:00:00 2001
From: aviator-bot <noreply@aviator.co>
Date: Mon, 8 Jun 2026 23:12:05 +0000
Subject: [PATCH] =?UTF-8?q?Step=201.1:=20Add=20amend-preference=20critical?=
 =?UTF-8?q?=20rule=20Add=20a=20new=20critical=20rule=20to=20**av-cli/skill?=
 =?UTF-8?q?s/av-cli/SKILL.md**=20immediately=20after=20the=20existing=20`-?=
 =?UTF-8?q?-no-edit`=20rule=20(after=20line=2044).=20The=20new=20rule=20sh?=
 =?UTF-8?q?ould=20make=20clear=20that,=20in=20contrast=20to=20general=20Gi?=
 =?UTF-8?q?t=20practice,=20amending=20is=20the=20correct=20default=20in=20?=
 =?UTF-8?q?av=20workflows=20because=20`av=20commit=20--amend`=20auto-resta?=
 =?UTF-8?q?cks=20children.=20-=20In=20the=20**Critical=20Rules**=20section?=
 =?UTF-8?q?=20of=20SKILL.md,=20add=20after=20the=20`NEVER=20pass=20--no-ed?=
 =?UTF-8?q?it`=20rule:=20`**`av=20commit=20--amend`=20is=20the=20standard?=
 =?UTF-8?q?=20approach**=20for=20updating=20an=20existing=20commit=20in=20?=
 =?UTF-8?q?a=20stack.=20Unlike=20general=20Git=20workflows=20that=20prefer?=
 =?UTF-8?q?=20new=20commits,=20amending=20is=20correct=20and=20expected=20?=
 =?UTF-8?q?here=20=E2=80=94=20av=20automatically=20restacks=20child=20bran?=
 =?UTF-8?q?ches.=20Prefer=20`av=20commit=20--amend`=20when=20updating=20ex?=
 =?UTF-8?q?isting=20work;=20use=20a=20new=20commit=20only=20for=20genuinel?=
 =?UTF-8?q?y=20separate,=20additive=20changes.`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 av-cli/skills/av-cli/SKILL.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/av-cli/skills/av-cli/SKILL.md b/av-cli/skills/av-cli/SKILL.md
index 6e68b1b..fb7b97c 100644
--- a/av-cli/skills/av-cli/SKILL.md
+++ b/av-cli/skills/av-cli/SKILL.md
@@ -43,6 +43,8 @@ cat <git-common-dir>/av/av.db
 
 **NEVER pass `--no-edit` to `av commit --amend`.** The flag doesn't exist — no-edit is already the default behavior. Just use `av commit --amend`.
 
+**`av commit --amend` is the standard approach** for updating an existing commit in a stack. Unlike general Git workflows that prefer new commits, amending is correct and expected here — av automatically restacks child branches. Prefer `av commit --amend` when updating existing work; use a new commit only for genuinely separate, additive changes.
+
 **NEVER use `gh pr edit --body` to update an av-managed PR's description.** It does a full body replacement and overwrites the `<!-- av pr metadata -->` block that av embeds at the end of the body to track the stack — stripping it silently breaks stack tracking. Use `av pr --title "..." --body "..."` instead; it works on existing PRs and preserves the metadata block.
 
 **NEVER use `av pr --edit`.** It opens an editor that agents cannot drive. Use `av pr --title "..." --body "..."` directly — it works for both creating new PRs and updating existing ones without an editor.