From a7c3bcf21906033b57ac58ac0a67438108688ea7 Mon Sep 17 00:00:00 2001 From: Steffen Siering Date: Fri, 11 Jan 2019 20:51:47 +0100 Subject: [PATCH] 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 (cherry picked from commit 05d7f5e2b1805956a92af77b373634d90c39f0e2) --- .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