Skip to content

git(memory): add union merge driver for MEMORY.md (kill rebase tax) #920

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
Apr 30, 2026
Merged

git(memory): add union merge driver for MEMORY.md (kill rebase tax) #920

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
11 changes: 11 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,14 @@
# conclusions and should remain reviewable in PRs.
docs/lost-substrate/artifacts/**/*.txt linguist-generated=true -diff
docs/lost-substrate/artifacts/**/*.log linguist-generated=true -diff

# memory/MEMORY.md is an unordered append-only index. Multiple
# in-flight PRs each adding a row produced recurring rebase conflicts
# (always trivial — keep both entries — but a token-tax recurring
# friction). The `union` merge driver auto-appends both sides on
# conflict, eliminating manual resolution. Multi-AI flagged: Claude.ai,
# Gemini, Ani, Deepseek (4 reviewers in the 2026-04-30 session), Gemini
# named the mechanism. Composes with Otto-363 substrate-or-it-didn't-
# happen — index-row landings are substrate; the merge driver makes
# their landing structurally robust.
Comment on lines +67 to +75
Copy link

Copilot AI Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1: This comment block introduces named per-insight attribution (e.g., specific model names and “named the mechanism”) in a current-state config file. Repo guidance says current-state surfaces should use role-refs and avoid name attribution (see .github/copilot-instructions.md:305-362). Suggest rewriting this to a short, purely functional rationale (append-only file → use union merge driver) without naming individual reviewers/models or session-specific provenance.

Suggested change
# memory/MEMORY.md is an unordered append-only index. Multiple
# in-flight PRs each adding a row produced recurring rebase conflicts
# (always trivial — keep both entries — but a token-tax recurring
# friction). The `union` merge driver auto-appends both sides on
# conflict, eliminating manual resolution. Multi-AI flagged: Claude.ai,
# Gemini, Ani, Deepseek (4 reviewers in the 2026-04-30 session), Gemini
# named the mechanism. Composes with Otto-363 substrate-or-it-didn't-
# happen — index-row landings are substrate; the merge driver makes
# their landing structurally robust.
# memory/MEMORY.md is an append-only index. Concurrent PRs often add
# distinct rows, and the correct conflict resolution is usually to keep
# both entries. The `union` merge driver does that automatically and
# removes recurring manual conflict resolution.

Copilot uses AI. Check for mistakes.
memory/MEMORY.md merge=union
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Remove merge=union from curated MEMORY index

memory/MEMORY.md is not actually append-only; the repo’s own guidance expects in-place curation (e.g., consolidate and revise existing entries in memory/README.md lines 47-49 and 89-92) and strict newest-first ordering (line 58). Setting merge=union here will silently keep both sides of conflicting edits instead of surfacing a conflict, so when one branch consolidates/removes/rewrites an existing row and another edits nearby rows, stale or contradictory rows can be reintroduced without reviewer visibility. The duplicate-link lint only catches repeated link targets (tools/hygiene/audit-memory-index-duplicates.sh lines 33-40), so many semantic conflicts will pass undetected.

Useful? React with 👍 / 👎.

Loading