From 249ab78249871fa42b2df3e3bc567a41423a36f6 Mon Sep 17 00:00:00 2001
From: Jason Reed <jcreedcmu@github.com>
Date: Mon, 15 Jun 2020 15:31:19 -0400
Subject: [PATCH] Use union merge strategy for CHANGELOG.md

---
 .gitattributes | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 59175dee0..06763cfc8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,3 +12,10 @@ yarn.lock                    merge=binary
 # For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
 #
 *.json                       linguist-language=JSON-with-Comments
+
+# Reduce incidence of needless merge conflicts on CHANGELOG.md
+# The man page at
+# https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gitattributes.html
+# suggests that this might interleave lines arbitrarily, but empirically
+# it keeps added chunks contiguous
+CHANGELOG.md                merge=union
\ No newline at end of file