Merge #335

335: Set merge=union Git attribute for CHANGELOG.md r=eldruin a=Dirbaio

Currently all PRs add a line to CHANGELOG.md, usually at the end. This means
they almost always run into merge conflicts since they are adding different lines at the exact same
place in the file.

With merge=union Git will automatically resolve these merge conflicts by keeping all lines from both sides.

Co-authored-by: Dario Nieuwenhuis <[email protected]>

Author: bors[bot]

.gitattributes

@@ -0,0 +1 @@
+CHANGELOG.md merge=union