diff --git a/docs/agents/MERGE-STATE.md b/docs/agents/MERGE-STATE.md index 13be005c..1a8ff8f6 100644 --- a/docs/agents/MERGE-STATE.md +++ b/docs/agents/MERGE-STATE.md @@ -22,7 +22,11 @@ dry-run merge is clean. Re-derive with: A=; B= git rev-list --count origin/main..$A # rises with every commit; not the claim -git merge-base --is-ancestor origin/main $A # PASS = exit 0 (fast-forward) +git merge-base --is-ancestor origin/main $A; echo $? + # PASS = 0 (fast-forward) + # ⚠️ prints NOTHING on success without + # the echo -- an empty line does not + # distinguish pass from fail comm -12 <(git diff --name-only $(git merge-base $A $B)..$A | sort) \ <(git diff --name-only $(git merge-base $A $B)..$B | sort) | wc -l # PASS = 0 (disjoint change sets)