django.git/.gitattributes, branch main django http://cgit.adnoto.dev/django.git/atom?h=main 2025-09-25T06:44:17Z Removed Git attribute merge=union for release notes. 2025-09-25T06:44:17Z Adam Johnson me@adamj.eu 2025-09-23T16:31:23Z urn:sha1:5cbd96003ce13621ac247f8b09c1b625daf9c7c8 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. Configured GitHub to highlight HTML files as Django templates. 2025-03-18T14:30:52Z Adam Johnson me@adamj.eu 2025-03-18T14:30:52Z urn:sha1:0dcc4a1dbc56b1f3aef9be749aff96a85ca92721 Fixed #19670 -- Applied CachedFilesMixin patterns to specific extensions 2016-03-30T12:34:41Z Claude Paroz claude@2xlibre.net 2016-02-27T20:30:07Z urn:sha1:edcecaf0dea718a8fb216df478df0d151a9ba04d Thanks Simon Meers for the initial patch, and Tim Graham for the review. Added git attribute merge=union for release notes 2015-06-02T16:04:40Z Adam Chainz adam@adamj.eu 2015-06-02T15:11:19Z urn:sha1:3222fc79431c0866aa65b2a83fbbffd2c3034d08 Force Unix-style line-endings for some helper files in staticfiles_tests. 2013-10-01T01:14:54Z Ramiro Morales ramiro@rmorales.net 2013-09-30T22:22:26Z urn:sha1:4372718e839d15c707d50cc78274a355258cf36a This fixes eight failures in the cached storage tests under Windows. Refs #18920 and 978d4476cf. Fixed #18920 -- Added `.gitattributes` to normalize line endings in HTML templates and avoid spurious failures in the core test suite on Windows. Many thanks to manfre, Claude Paroz, Karen Tracey, MaxV and Daniel Langer for their advising and testing. 2012-11-21T09:19:00Z Julien Phalip jphalip@gmail.com 2012-11-21T09:19:00Z urn:sha1:978d4476cf1956fe91a2a6b3b5d2157005560c33