try to avoid merge conflicts in GitInfo.txt (#5715)

dotnet · Apr 3, 2019 · cc05cd2 · cc05cd2
1 parent 6950db8
commit cc05cd2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -0,0 +1,2 @@
+[merge "ours"]
+    driver = true