From ce863566adb6d87bcfa47b8de847d682a96b3e26 Mon Sep 17 00:00:00 2001
From: zaliu <35415350+zaliu@users.noreply.github.com>
Date: Thu, 12 Nov 2020 12:55:58 -0800
Subject: [PATCH] add merge=union gitattributes for CHANGELOG.md (#1225)

---
 .gitattributes | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..692d65361
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+/CHANGELOG.md merge=union
+*.pdf binary
+*.doc binary
+*.docx binary
+*.ppt binary
+*.pptx binary
+*.xls binary
+*.xlsx binary
+*.xps binary