From 3437580896c8b4dbd0fa0ebd2945832a7b505155 Mon Sep 17 00:00:00 2001
From: Priyanka Bettadapura <pbettadapura@microsoft.com>
Date: Mon, 5 Jan 2026 16:38:29 +0530
Subject: [PATCH] prefer ours for .github merges/rebases

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..db381bb9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.github/** merge=ours
\ No newline at end of file