From b56fed338a1997e87b3deba4bc0b3f7842620688 Mon Sep 17 00:00:00 2001 From: yyh Date: Sat, 7 Feb 2026 13:28:21 +0800 Subject: [PATCH] update --- MERGE_NOTES_HITL_WEB_SYNC.md | 1 + 1 file changed, 1 insertion(+) diff --git a/MERGE_NOTES_HITL_WEB_SYNC.md b/MERGE_NOTES_HITL_WEB_SYNC.md index 36a0ff54d5..a0cfda814e 100644 --- a/MERGE_NOTES_HITL_WEB_SYNC.md +++ b/MERGE_NOTES_HITL_WEB_SYNC.md @@ -218,6 +218,7 @@ When backend branch performs `git merge origin/main`: - resolve remaining unmerged web paths to ours (for delete-on-ours case: `git rm `) - `git restore --source=HEAD --staged --worktree --no-overlay -- web` 3. Confirm `web/` is fully unchanged in merge state: + - `git status --short -- web` should be empty - `git diff --name-only --diff-filter=U -- web` should be empty - `git diff --cached --name-only -- web` should be empty - `git diff --name-only -- web` should be empty