From 67a5c19b1717ba367e989d74778eedc375e60a26 Mon Sep 17 00:00:00 2001
From: Karsten Jeschkies <k@jeschkies.xyz>
Date: Tue, 11 Jan 2022 21:18:54 +0100
Subject: [PATCH] Enable merge union strategy for CHANGELOG.md. (#5102)

Summary:
This provides a reasonable automatic merge strategy for changelog
entries. No more merge conflicts on changelog changes.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..a19ade077d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union