From bfb6f56b32bad90c7f03b9d6e149a2779f657dcc Mon Sep 17 00:00:00 2001
From: Steffen Siering <steffen.siering@elastic.co>
Date: Wed, 23 Jan 2019 14:29:22 +0100
Subject: [PATCH] Cherry-pick #10003 to 6.5: configure union merge for
 Changelog*.next.asciidoc (#10026)

Cherry-pick of PR #10003 to 6.5 branch. Original message:

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`.

Note: github UI seems to ignore the setting. Convenience will only be improved on command line.
---
 .gitattributes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index f02f9636b36..2c1aaba4dec 100644
--- 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