diff --git a/AGENT-BRIEF.md b/AGENT-BRIEF.md
index d18b39d4b..26c7baa0e 100644
--- a/AGENT-BRIEF.md
+++ b/AGENT-BRIEF.md
@@ -28,6 +28,14 @@ export FORGEJO_PASS_ENTRY=vivarium/forgejo-certified-sandbox GIT_TERMINAL_PROMPT
 unset SSH_ASKPASS DISPLAY
 
 git fetch origin && git rebase origin/main        # you resolve every conflict, not main
+                                                  # ...UNLESS this branch has ever recorded a
+                                                  # `-s ours` merge — then MERGE, never rebase.
+                                                  # See "Never rebase a branch that has ever
+                                                  # recorded a `-s ours` merge" below; landing by
+                                                  # rebase and reconciling the old tip with
+                                                  # `-s ours` is what puts one there, so the very
+                                                  # next landing on the same branch is the one
+                                                  # this catches. `git log --merges` tells you.
 
 if main-capture capture --wait; then              # --wait retries with backoff while held;
                                                   # release ONLY a lock you actually took