From cc05cd2026200b2a5cb494e359706e2e68174eba Mon Sep 17 00:00:00 2001
From: Stephane Delcroix <stephane@delcroix.org>
Date: Wed, 3 Apr 2019 08:49:40 +0200
Subject: [PATCH] try to avoid merge conflicts in GitInfo.txt (#5715)

---
 .gitattributes | 3 +++
 .gitconfig     | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 .gitconfig

diff --git a/.gitattributes b/.gitattributes
index f724967cde09..408b5738f0e6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,3 +15,6 @@
 
 # Always checkout docs using unix line endings because mdoc uses unix line endings even on windows
 /docs/**/*.xml text eol=lf
+
+# avoid overriding GitInfo.txt on merge
+GitInfo.txt merge=ours
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 000000000000..4a8fc6b2a1f9
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,2 @@
+[merge "ours"]
+    driver = true