Fix CHANGELOG.md: restore CRLF after a second accidental LF renormalize (#2695 fallout) - #2697
Merged
Merged
Conversation
…ze (#2695 fallout) PR #2695's own merge-conflict resolution (commit 9a33208, merging origin/dev to resolve a CHANGELOG collision with #2694) renormalized the whole file to LF again, the same trap #2696 had just fixed for #2694 earlier today. Confirmed by bisecting: 0b2b8b7 (the #2696 fix) was 3057/3057 CRLF; 9a33208 was 0/3059 CRLF. Rebuilt from the raw stored blob (confirmed 0 pre-existing CR bytes, so the LF->CRLF conversion is lossless) with the .git/info/attributes -text override in place so the commit isn't re-normalized on the way in. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
Reviewed. Verified mechanically: stripping |
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.
PR #2695's own merge-conflict resolution (commit
9a33208b) renormalized CHANGELOG.md to LF again — the same trap #2696 just fixed for #2694. Bisected:0b2b8b77(the #2696 fix) was 3057/3057 CRLF;9a33208bonward is 0/3059 CRLF. Rebuilt from the raw stored blob (confirmed 0 pre-existing CR bytes, lossless conversion) with the.git/info/attributes -textoverride in place. Text content unchanged — this is purely a line-ending correction.