Repository navigation
v4.39.1 — same-thread merge claim: honest boundary - #29
Merged
Merged
Conversation
…dary An independent CoPilot assessment of v4.39.0 flagged the claim "editing the same thread conflicts per-file" as overstating git: verified by live rehearsal, conflicts arise only on adjacent/overlapping hunks; separated edits merge cleanly with both sides kept (nothing lost; consistency is the write-time contradiction check's job — identical to the pre-4.39.0 layout). MERGE.md/schema/design doc state the boundary; the merge contract test pins it with two new cases (4 -> 6). No behavior change. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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.
What
v4.39.1 (PATCH) — same-thread merge claim: honest boundary. Docs-and-test precision, zero behavior change:
MERGE.md,.agent/schema.md, anddocs/DESIGN-merge-scale.mdnow state what git actually guarantees for same-thread edits — conflicts on adjacent/overlapping hunks; edits separated by unchanged lines merge cleanly with both sides kept — and route the clean-merge case to the write-time contradiction check (DECAY.md§10).tests/test_thread_layout_merge.shpins the measured boundary with two new cases (separated → clean keep-both; adjacent → conflict; 4 → 6 cases). Ladder row +4.39.0 → 4.39.1rung, CHANGELOG, README. No semantic step — targets converge by plain re-copy ofMERGE.md+.agent/schema.md.Why
An independent CoPilot assessment of v4.39.0 (delivered the day it shipped) flagged that "both sides editing the same thread conflicts per-file" overstates git's hunk semantics. Verified by live merge rehearsals before acting: the boundary is one unchanged line, in a 5-line thread file as much as a 16-line one. Low severity — nothing is lost (keep-both is MERGE.md's own Tier 1 outcome) and the pre-4.39.0 layout merged identically, so no regression — but the honest-signal doctrine applies: the claim must not outrun the mechanism.
Verification
bash tests/test_thread_layout_merge.sh— 6 cases PASS, including the two new boundary pins--check-manifestOK;memory-lint0 errors, 0 warnings, byte-identical across runtimesCo-Authored-By: Claude Fable 5 noreply@anthropic.com
🤖 Generated with Claude Code