configure union merge for Changelog*.next.asciidoc (#10003)

* configure union merge for Changelog*.next.asciidoc This change automatically merges Changelog*.next.asciidoc files when merging or rebasing via `merge=union`. No more need to fix changelog files when doing `git rebase master`. * Remove union merge from Changelog.asciidoc
elastic · Jan 11, 2019 · 05d7f5e · 05d7f5e
1 parent 09037fc
commit 05d7f5e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,5 @@
-CHANGELOG.md  merge=union
-CHANGELOG.asciidoc  merge=union
+CHANGELOG.next.asciidoc  merge=union
+CHANGELOG-developer.next.asciidoc  merge=union
 
 # Keep these file types as CRLF (Windows).
 *.bat    text eol=crlf