Skip to content

fix(check-no-conflict-markers.ts): allowlist parity with .sh (gate.yml prerequisite) #1379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AceHack merged 1 commit into from
May 3, 2026
Merged

fix(check-no-conflict-markers.ts): allowlist parity with .sh (gate.yml prerequisite) #1379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tools/hygiene/check-no-conflict-markers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ])/;
Expand Down
Loading