Skip to content

hygiene(conflict-markers): allowlist rerere-cache-dividend memory file #932

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 2 commits into from
Apr 30, 2026
Merged

hygiene(conflict-markers): allowlist rerere-cache-dividend memory file #932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cccc48
hygiene(conflict-markers): allowlist rerere-cache-dividend memory fil…
AceHack Apr 30, 2026
184a0da
review-fix(#932): drop hardcoded line numbers from allowlist rationale
AceHack Apr 30, 2026
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
8 changes: 8 additions & 0 deletions tools/hygiene/check-no-conflict-markers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading