GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Prevent GitHub's web conflict editor from converting LF to CRLF by hugovk · Pull Request #148739 · python/cpython

Conversation

@hugovk

@hugovk hugovk commented Apr 18, 2026 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member

I resolved a conflict in a PR using the GitHub web editor, using Chrome on macOS, which involved moving lines around. However, GitHub also changed the LF endings to CRLF:

7208828

So I had to fix it locally:

fede255

I don't know why GitHub does this. It doesn't seem to do it for simple edits, moving lines appears to be important.

A similar thing happened recently with f938f01, which only affected a few lines.

We added extra linting (#148336) to help catch stuff like this, but it only checks that the endings match the majority. That won't pick up whole file changes!

Anyway, doing some tests, GH does at least respect .gitattributes, so let's declare it.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
tim-one reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
@hugovk
Prevent GitHub's web conflict editor from converting LF to CRLF
42eb6b0
@hugovk hugovk added needs backport to 3.13 only security fixes needs backport to 3.14 bugs and security fixes labels Apr 18, 2026
@bedevere-app bedevere-app Bot added the awaiting core review label Apr 18, 2026
@hugovk hugovk added skip issue skip news labels Apr 18, 2026
@StanFromIreland

StanFromIreland commented Apr 18, 2026

Copy link
Copy Markdown
Member

It seems there is a NEWS entry with CRLF endings: https://github.com/python/cpython/actions/runs/24613765518/job/71972503301?pr=148739
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@hugovk
Convert to LF
008282f
@hugovk

hugovk commented Apr 18, 2026

Copy link
Copy Markdown
Member Author

Converted that to LF too.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
StanFromIreland
StanFromIreland approved these changes Apr 18, 2026
View reviewed changes
@bedevere-app bedevere-app Bot added awaiting merge and removed awaiting core review labels Apr 18, 2026
@hugovk
hugovk merged commit 9e23652 into python:main Apr 19, 2026
55 checks passed

Uh oh!

There was an error while loading. Please reload this page.
@hugovk
hugovk deleted the 3.15-rst-eol branch April 19, 2026 09:21
@miss-islington-app

miss-islington-app Bot commented Apr 19, 2026

Copy link
Copy Markdown

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14.
🐍🍒⛏🤖
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-app bedevere-app Bot removed the awaiting merge label Apr 19, 2026
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 19, 2026
@hugovk @miss-islington
Prevent GitHub's web conflict editor from converting LF to CRLF (pyth…
440fe19 
…onGH-148739)

(cherry picked from commit 9e23652)

Co-authored-by: Hugo van Kemenade <[email protected]>
@bedevere-app

bedevere-app Bot commented Apr 19, 2026

Copy link
Copy Markdown

GH-148748 is a backport of this pull request to the 3.14 branch.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Apr 19, 2026
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 19, 2026
@hugovk @miss-islington
Prevent GitHub's web conflict editor from converting LF to CRLF (pyth…
bdd8572 
…onGH-148739)

(cherry picked from commit 9e23652)

Co-authored-by: Hugo van Kemenade <[email protected]>
@bedevere-app

bedevere-app Bot commented Apr 19, 2026

Copy link
Copy Markdown

GH-148749 is a backport of this pull request to the 3.13 branch.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-app bedevere-app Bot removed the needs backport to 3.13 only security fixes label Apr 19, 2026
hugovk added a commit that referenced this pull request Apr 19, 2026
@miss-islington @hugovk
[3.13] Prevent GitHub's web conflict editor from converting LF to CRLF (
66ba1c7 
GH-148739) (#148749)

Co-authored-by: Hugo van Kemenade <[email protected]>
hugovk added a commit that referenced this pull request Apr 19, 2026
@miss-islington @hugovk
[3.14] Prevent GitHub's web conflict editor from converting LF to CRLF (
f2a0dcb 
GH-148739) (#148748)

Co-authored-by: Hugo van Kemenade <[email protected]>
ljfp pushed a commit to ljfp/cpython that referenced this pull request Apr 25, 2026
@hugovk @ljfp
Prevent GitHub's web conflict editor from converting LF to CRLF (pyth…
d1118cd 
…on#148739)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@StanFromIreland StanFromIreland StanFromIreland approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@hugovk @StanFromIreland
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.