diff --git a/tools/hygiene/check-no-conflict-markers.sh b/tools/hygiene/check-no-conflict-markers.sh index 7b67cd24c..11c4b4d9b 100755 --- a/tools/hygiene/check-no-conflict-markers.sh +++ b/tools/hygiene/check-no-conflict-markers.sh @@ -57,6 +57,14 @@ ALLOWLIST=( # examples. Allowed because the file body is meta-discussion not # accidental marker leakage. "memory/feedback_otto_341_lint_suppression_is_self_deception_noise_signal_or_underlying_fix_greenfield_large_refactors_welcome_training_data_human_shortcut_bias_2026_04_26.md" + # Rerere cache dividend memory file — landed PR #694 (2026-04-30). + # The "Worked-example trace" section quotes the MEMORY.md sibling- + # DIRTY conflict shape inside a fenced code block as the rule's + # documented example. Fenced examples of merge markers are + # documentation, not leakage. (Line numbers intentionally omitted + # so the rationale survives section-level edits — file-level + # allowlist scope is the durable contract.) + "memory/feedback_rerere_conflict_resolution_cache_dividend_amara_2026_04_28.md" ) is_allowed() {