Skip to content

Update merge strategy for CHANGELOG.md

Richard Clamp requested to merge rc-changelog.md-merge into master

In fee58e65 the file was renamed from CHANGELOG -> CHANGELOG.md and later converted to markdown.

Here we update the .gitattributes to reflect the rename, as merge=union will possibly reduce some of the rebase conflicts in CHANGELOG.md

Edited by GitLab Release Tools Bot

Merge request reports