diff --git a/tools/hygiene/check-no-conflict-markers.ts b/tools/hygiene/check-no-conflict-markers.ts index cdb45cabd..2e4be4060 100644 --- a/tools/hygiene/check-no-conflict-markers.ts +++ b/tools/hygiene/check-no-conflict-markers.ts @@ -39,6 +39,12 @@ const ALLOWLIST: readonly string[] = [ SELF_PATH, "tools/hygiene/check-no-conflict-markers.ts", "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. Parity with .sh ALLOWLIST. + "memory/feedback_rerere_conflict_resolution_cache_dividend_amara_2026_04_28.md", ]; const MARKER_RE = /^(<<<<<<<[\t ]|=======$|>>>>>>>[\t ])/;