Add custom merge tool for canary files (#3675)

microsoft · Mar 29, 2022 · 7584bdf · 7584bdf
1 parent 8a9bb08
commit 7584bdf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,3 +6,4 @@
 *.h linguist-language=C++
 *.cpp linguist-language=C++
 
+.*canary merge=keeplocal
diff --git a/.gitconfig b/.gitconfig
@@ -0,0 +1,3 @@
+[merge "keeplocal"]
+	name = Always keep local file during merge
+	driver = true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@
		*.h linguist-language=C++
		*.cpp linguist-language=C++

		.*canary merge=keeplocal