Skip to content

Prevent Changelog Merge Conflicts

Timur Oberhuberrequested to merge
add-changelog-git-attributes into dev

Description

  • Adds merge=union for changelog to prevent merge conflicts

Related Issues

  • N/A

Checklist

  • I have added a changelog entry to reflect the significant changes I made.

Merge request reports