From 4fb47e65f425bbd494fee9ee118761abab370ee4 Mon Sep 17 00:00:00 2001
From: ryan <ryan@arctel.net>
Date: Sun, 30 Aug 2026 14:28:38 +0800
Subject: [PATCH] chore(git): keep OpenFlare-owned paths on merge

---
 .gitattributes | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 5378fe08..ae85146a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,5 @@
-* -text
\ No newline at end of file
+* -text
+backend/OpenFlare/**    merge=ours
+frontend/**             merge=ours
+docs/changelog/**       merge=ours
+docs/superpowers/**     merge=ours