From f89db4915fb4e725a7c2a7b7d693af64b4f2fbb2 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 24 Apr 2020 00:16:20 -0700 Subject: [PATCH] [ci skip] changelog conflicts are a thing of the past (#14098) (cherry picked from commit f07f07eef9c3a92b5ed57c7932b91a0d48f95c5b) --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..674da79398 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# Avoids changelog conflicts by assuming additions-only, which is by far the common case. +# In the rare case where branch b1 rebases against branch b2 and both branches +# modified the same changelog entry, you'll end up with that changelog entry +# duplicated, which is easily identifiable and fixable. +/changelog.md merge=union +