mirror of
https://github.com/django/django.git
synced 2025-11-07 07:15:35 +00:00
5cbd96003c
I added this back in 3222fc7943 to try
and avoid merge conflicts from concurrent edits to release notes in
different branches. However, in my recent experience, it has caused
more problems than it solves. I have found that when rebasing a branch
that modifies a release note, it can merge sections without an
intermediate blank line, leading to broken reST syntax. Example spotted
in code review:
https://github.com/django/django/pull/17554#discussion_r2311296513 .
I think it’s better we remove this configuration and deal with merge
conflicts deliberately.
9 lines
360 B
Plaintext
9 lines
360 B
Plaintext
# Normalize line endings to avoid spurious failures in the core test suite on Windows.
|
|
*html text eol=lf
|
|
*css text eol=lf
|
|
*js text eol=lf
|
|
tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
|
|
tests/staticfiles_tests/project/documents/test/*txt text eol=lf
|
|
# Make GitHub syntax-highlight .html files as Django templates
|
|
*.html linguist-language=django
|