From 0934cc32e552f6005dc265ee7889d14cf16bac63 Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Wed, 6 Jun 2018 08:21:20 +0200 Subject: [PATCH] Add union merge for CHANGELOG to reduce merge conflicts (#15) As the CHANELOG is updated in each PR this often leads to merge conflicts. As the CHANGELOG normally can be merged with a union merge this should reduce conflicts. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..4c2a8ed233 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union