From c9e1eff6cc6ba5c99c4b6958e5be4b6c06a187bd Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 19 Feb 2021 21:25:47 +0100
Subject: [PATCH] chore: add merge=union git attribute for changelogs (#1475)

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..fefd5dc5b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+core/CHANGELOG.md merge=union
+python/CHANGELOG.md merge=union
+legacy/firmware/CHANGELOG.md merge=union
+legacy/bootloader/CHANGELOG.md merge=union