From 91939e7ac940de51aff3d787de55f6daa8b8c62c Mon Sep 17 00:00:00 2001
From: Malasaur <malasaur@tuta.io>
Date: Mon, 17 Nov 2025 10:26:51 +0100
Subject: [PATCH] Fixed .gitattributes again

---
 .gitattributes | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 58e3bf7..875847e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,11 +6,11 @@
 #   git config merge.ours.driver true
 # This tells git to ignore upstream files and keep local ones on merge.
 
-index.toml ours
-pack.toml ours
-README.md ours
-config/fabric_loader_dependencies.json ours
-config/isxander-main-menu-credits.json ours
+index.toml merge=ours
+pack.toml merge=ours
+README.md merge=ours
+config/fabric_loader_dependencies.json merge=ours
+config/isxander-main-menu-credits.json merge=ours
 
 # === BASE FILES
 # These are files added by the modpack.
@@ -21,11 +21,11 @@ config/isxander-main-menu-credits.json ours
 #   git config merge.theirs.driver "copy %B %A" # Windows
 # This tells git to replace local files with upstream ones on merge.
 
-mods/* theirs
-resourcepacks/* theirs
-shaderpacks/* theirs
-config/yosbr/config/* theirs
-scripts/* theirs
+mods/* merge=theirs
+resourcepacks/* merge=theirs
+shaderpacks/* merge=theirs
+config/yosbr/config/* merge=theirs
+scripts/* merge=theirs
 
 # === OTHER FILES
 # All other files must be merged manually.