From 8598e188b1d1c2d9d7fe2eccaf136bdb693f490b Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Wed, 12 Jul 2023 09:15:09 -0700 Subject: [PATCH] Set merge=union git attribute for CHANGELOG.md Currently all PRs add a line to CHANGELOG.md; this means they almost always run into merge conflicts since they are adding different lines at the exact same place in the file. With `merge=union`, git will automatically resolve these merge conflicts by keeping all lines from both sides. --- .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