mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-25 07:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Removed Git attribute merge=union for release notes.

Browse Source 
I added this back in 3222fc79431c0866aa65b2a83fbbffd2c3034d08 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.
This commit is contained in:
Adam Johnson 2025-09-23 17:31:23 +01:00 committed by Mariusz Felisiak
parent 00174507f8
commit 5cbd96003c
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -4,6 +4,5 @@
*js text eol=lf *js text eol=lf
tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
tests/staticfiles_tests/project/documents/test/*txt text eol=lf tests/staticfiles_tests/project/documents/test/*txt text eol=lf
docs/releases/*.txt merge=union
# Make GitHub syntax-highlight .html files as Django templates # Make GitHub syntax-highlight .html files as Django templates
*.html linguist-language=django *.html linguist-language=django