Title: Prevent GitHub's web conflict editor from converting LF to CRLF by hugovk · Pull Request #148739 · python/cpython · GitHub
Open Graph Title: Prevent GitHub's web conflict editor from converting LF to CRLF by hugovk · Pull Request #148739 · python/cpython
X Title: Prevent GitHub's web conflict editor from converting LF to CRLF by hugovk · Pull Request #148739 · python/cpython
Description: 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.
Open Graph Description: 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...
X Description: 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...
Opengraph URL: https://github.com/python/cpython/pull/148739
X: @github
Domain: github.com
| route-pattern | /:user_id/:repository/pull/:id/files(.:format) |
| route-controller | pull_requests |
| route-action | files |
| fetch-nonce | v2:59e56068-49c4-9d6c-04ba-10f92aa95eb7 |
| current-catalog-service-hash | ae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b |
| request-id | CA82:3BE023:55DEED:72E048:6A540EC9 |
| html-safe-nonce | bdd6c3321d2d5f333e38ac67640d703ac12f649a787ea64b09aee2c0d45a4203 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJDQTgyOjNCRTAyMzo1NURFRUQ6NzJFMDQ4OjZBNTQwRUM5IiwidmlzaXRvcl9pZCI6IjczMTc1NDAyOTMxNDE4NjAwNDEiLCJyZWdpb25fZWRnZSI6ImlhZCIsInJlZ2lvbl9yZW5kZXIiOiJpYWQifQ== |
| visitor-hmac | 6a8d232201b91fba94979774fd962d09d45afcce6c0ee6973721f20ba8ac49e2 |
| hovercard-subject-tag | pull_request:3550664667 |
| github-keyboard-shortcuts | repository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | / |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/python/cpython/pull/148739/files |
| twitter:image | https://avatars.githubusercontent.com/u/1324225?s=400&v=4 |
| twitter:card | summary_large_image |
| og:image | https://avatars.githubusercontent.com/u/1324225?s=400&v=4 |
| og:image:alt | 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... |
| og:site_name | GitHub |
| og:type | object |
| hostname | github.com |
| expected-hostname | github.com |
| None | b9a586c06a05a7a86fc7e3f4dbd03e42f6869085879aa184aa6369456dbd50fb |
| turbo-cache-control | no-preview |
| diff-view | unified |
| go-import | github.com/python/cpython git https://github.com/python/cpython.git |
| octolytics-dimension-user_id | 1525981 |
| octolytics-dimension-user_login | python |
| octolytics-dimension-repository_id | 81598961 |
| octolytics-dimension-repository_nwo | python/cpython |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 81598961 |
| octolytics-dimension-repository_network_root_nwo | python/cpython |
| turbo-body-classes | logged-out env-production page-responsive full-width |
| disable-turbo | true |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 07a982c1d40157c619b364352b704c3ce66bb332 |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
Links:
Viewport: width=device-width