Conversation
…e (PR #694 substrate) The rerere memory file landed via PR #694 (2026-04-30) contains a worked-example trace at lines 117-121 showing the MEMORY.md sibling- DIRTY conflict shape inside a fenced code block. Those literal merge markers are documentation (the rule's worked example), not accidental leakage from a botched merge. Adding the file to ALLOWLIST keeps the lint-as-mechanism approach working — accidental marker leakage still fires; documented examples in named substrate files are explicitly opted in. Composes with the existing allowlist entry for Otto-341 lint- suppression file, same pattern.
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
There was a problem hiding this comment.
Pull request overview
Updates the conflict-marker hygiene lint allowlist to exempt a specific memory file that intentionally contains literal git merge marker tokens within a fenced code block (as documentation), preventing false-positive lint failures.
Changes:
- Add
memory/feedback_rerere_conflict_resolution_cache_dividend_amara_2026_04_28.mdto the allowlist intools/hygiene/check-no-conflict-markers.sh. - Document the allowlist rationale inline next to the new entry.
Copilot review thread: the rationale comment hard-coded 'lines 117-121'
which is liable to drift as the memory entry evolves. Reworded to
describe the example by section ('Worked-example trace' quoting the
MEMORY.md sibling-DIRTY conflict shape) rather than line position.
The file-level allowlist scope is the durable contract.
AceHack
deleted the
hygiene/conflict-markers-allowlist-rerere-file-2026-04-30
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds the rerere memory file (landed via PR #694) to the conflict-markers lint ALLOWLIST.
The file's worked-example trace at lines 117-121 contains literal merge marker tokens (
<<<<<<<,=======,>>>>>>>) inside a fenced code block — used as documentation of the MEMORY.md sibling-DIRTY conflict shape that rerere recorded. The lint correctly flagged them as line-start markers; the allowlist mechanism is exactly the documented escape valve for legitimate-discussion files.Composes with the existing allowlist entry for
feedback_otto_341_*.md— same pattern, same reasoning.Test plan
bash tools/hygiene/check-no-conflict-markers.shpasses locally🤖 Generated with Claude Code