Avoiding merge conflicts in changelogs/release notes

Anecdotally the most common source of conflicts on my merge requests come from changelog entries and release notes. Whenever another MR gets merged before mine that adds an entry, git will decide that this is a conflict.

Resolving these conflicts is trivial: we always want both.

Git seems to have an option for specifying this: https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-union You set it using the .gitattributes file.

Does anyone have thoughts about this? Or ideas for different ways to solve this?