Skip to content

Commit 5cbd960

Browse files
adamchainzfelixxm
authored andcommitted
Removed Git attribute merge=union for release notes.
I added this back in 3222fc7 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: django#17554 (comment) . I think it’s better we remove this configuration and deal with merge conflicts deliberately.
1 parent 0017450 commit 5cbd960

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
*js text eol=lf
55
tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
66
tests/staticfiles_tests/project/documents/test/*txt text eol=lf
7-
docs/releases/*.txt merge=union
87
# Make GitHub syntax-highlight .html files as Django templates
98
*.html linguist-language=django

0 commit comments

Comments
 (0)