Skip to content
Permalink
Browse files

docs: use union merge strategy for CHANGELOG

This avoids "conflicts" on CHANGELOG.md changes, including rebase, etc

closes #1107
  • Loading branch information
vlsi committed Jun 30, 2018
1 parent 177f63b commit 70189203574d9f0faf37b8a9bcee1d76ffa6b676
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitattributes
@@ -6,3 +6,4 @@
*.xml text
*.yaml text
*.yml text
/CHANGELOG.md merge=union

0 comments on commit 7018920

Please sign in to comment.
You can’t perform that action at this time.