From 7584bdfb4fb2f00c3629b113ac3a40fac35e0a9f Mon Sep 17 00:00:00 2001
From: Eddy Ashton <edashton@microsoft.com>
Date: Tue, 29 Mar 2022 15:02:30 +0100
Subject: [PATCH] Add custom merge tool for canary files (#3675)

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

diff --git a/.gitattributes b/.gitattributes
index 1631d45617f0..41cd99414353 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,4 @@
 *.h linguist-language=C++
 *.cpp linguist-language=C++
 
+.*canary merge=keeplocal
\ No newline at end of file
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 000000000000..fa0ead4d3537
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,3 @@
+[merge "keeplocal"]
+	name = Always keep local file during merge
+	driver = true