From 9c232a03f8b517456d08bb0fb23df6e77f06f8e0 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Thu, 23 Apr 2020 16:58:11 -0700 Subject: [PATCH] [ci skip] changelog conflicts are a thing of the past --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000..674da79398251 --- /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 +