Fix CHANGELOG.md: restore CRLF after an accidental LF renormalize (#2694 fallout) - #2696
Conversation
) My merge-conflict resolution in #2694 (merging origin/dev's #2693 wraparound fix into my collection-health branch) committed without the .git/info/attributes CHANGELOG.md -text override in place, so git silently renormalized the WHOLE file to LF on staging. Content is byte-identical to what merged (verified with a CR-stripped diff); only line endings are restored to the CRLF this file has always used. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
Reviewed. This is a doc-only, single-file change (
Given that, one process suggestion (non-blocking, since this PR itself is a correct, minimal fix): Nothing in-repo currently prevents this from happening again — no CI check verifies No functional/security/performance issues found. |
…ze (erikdarlingdata#2695 fallout) PR erikdarlingdata#2695's own merge-conflict resolution (commit 9a33208, merging origin/dev to resolve a CHANGELOG collision with erikdarlingdata#2694) renormalized the whole file to LF again, the same trap erikdarlingdata#2696 had just fixed for erikdarlingdata#2694 earlier today. Confirmed by bisecting: 0b2b8b7 (the erikdarlingdata#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>
What
My own merge-conflict resolution while landing #2694 (merging
origin/dev's #2693 into my branch) committed the resolvedCHANGELOG.mdwithout the.git/info/attributesCHANGELOG.md -textoverride in place — the standard trap this repo's CHANGELOG workflow requires guarding against. Git silently renormalized the entire file to LF on staging, and that landed ondevvia #2694's merge commit.Fix
Rebuilt the file with CRLF on every line. Verified via a CR-stripped diff against the current
devcontent that this is byte-identical modulo line endings — no textual content changed, only the line-ending restoration.No build/test impact (a
.mdfile, not compiled).🤖 Generated with Claude Code