docs(claude): diff3 fabricates a false-clean merge on the NUL-sentinel file - #175
Open
asachs01 wants to merge 1 commit into
Open
docs(claude): diff3 fabricates a false-clean merge on the NUL-sentinel file#175asachs01 wants to merge 1 commit into
asachs01 wants to merge 1 commit into
Conversation
…l file Extending the 2026-08-26 NUL-byte entry: GNU diff3 on extracted blobs of src/cli/bus.ts silently dropped one side's real changes and reported a clean 0-conflict merge, worse than the grep/rg false-zero shapes already documented since it hands back a confident wrong result instead of an absence. git merge-file / git merge-tree are unaffected — use those for any 3-way check on this file. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
|
Warning Review limit reachedNext included review available in 26 minutes. View limit detailsLimit details: You’ve used all 10 included reviews currently available. Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. Review configuration: ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Advanced Run ID: 📒 Files selected for processing (1)
Comment |
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
1 participant
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.
Extends the 2026-08-26 NUL-byte entry: GNU diff3 on extracted blobs of src/cli/bus.ts silently drops one side's real changes and reports a clean 0-conflict merge — worse than the already-documented grep/rg false-zero shapes since it hands back a confident wrong result instead of an absence. git merge-file / git merge-tree are unaffected. Found while diagnosing a real conflict on cortextos#151.
Docs-only, single file, additive.
Need help on this PR? Tag
@codesmith-botwith what you need. Autofix is disabled.