6 Commits

Author	SHA1	Message	Date
Adam Johnson	5cbd96003c	Removed Git attribute merge=union for release notes. ... 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.	2025-09-25 08:44:17 +02:00
Adam Johnson	0dcc4a1dbc	Configured GitHub to highlight HTML files as Django templates.	2025-03-18 11:30:52 -03:00
Claude Paroz	edcecaf0de	Fixed #19670 -- Applied CachedFilesMixin patterns to specific extensions ... Thanks Simon Meers for the initial patch, and Tim Graham for the review.	2016-03-30 14:34:41 +02:00
Adam Chainz	3222fc7943	Added git attribute merge=union for release notes	2015-06-02 12:04:40 -04:00
Ramiro Morales	4372718e83	Force Unix-style line-endings for some helper files in staticfiles_tests. ... This fixes eight failures in the cached storage tests under Windows. Refs #18920 and 978d4476cf.	2013-09-30 22:14:54 -03:00
Julien Phalip	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-21 10:19:00 +01:00