From 35398e0ffb38eb90ecb8a897d9c26d71bb5a2215 Mon Sep 17 00:00:00 2001
From: Philipp Spiess <hello@philippspiess.com>
Date: Mon, 26 Aug 2024 16:27:41 +0200
Subject: [PATCH] Add .gitattributes and define a merge strategy for changelog
 files

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

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