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

360 B

Raw Permalink Blame History

View Raw