django.git - django

Age	Commit message (Collapse)	Author
2025-09-25	Removed Git attribute merge=union for release notes.	Adam Johnson
	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.
2025-03-18	Configured GitHub to highlight HTML files as Django templates.	Adam Johnson

2016-03-30	Fixed #19670 -- Applied CachedFilesMixin patterns to specific extensions	Claude Paroz
	Thanks Simon Meers for the initial patch, and Tim Graham for the review.
2015-06-02	Added git attribute merge=union for release notes	Adam Chainz

2013-09-30	Force Unix-style line-endings for some helper files in staticfiles_tests.	Ramiro Morales
	This fixes eight failures in the cached storage tests under Windows. Refs #18920 and 978d4476cf.
2012-11-21	Fixed #18920 -- Added `.gitattributes` to normalize line endings in HTML ↵	Julien Phalip
	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.