From 5cbd96003ce13621ac247f8b09c1b625daf9c7c8 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 23 Sep 2025 17:31:23 +0100 Subject: [PATCH] Removed Git attribute merge=union for release notes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 2c9770c278..1a5fcdfd81 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,5 @@ *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 -docs/releases/*.txt merge=union # Make GitHub syntax-highlight .html files as Django templates *.html linguist-language=django