From a842d6827c74108156f0f21e34ff93c2a7a349fb Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Sat, 15 Feb 2020 10:25:02 +0000 Subject: [PATCH] Add custom merge strategy for CHANGELOG.md The merge strategy `union` should hopefully reduce the number of conflicts when trying to rebase the configuration file, since most of the changes are simple additions anyways. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3d432e0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/CHANGELOG.md merge=union