From b14933ed9600685ca350912443b0d529d323e301 Mon Sep 17 00:00:00 2001
From: Malasaur <malasaur@tuta.io>
Date: Mon, 17 Nov 2025 10:22:30 +0100
Subject: [PATCH 1/2] Fixed .gitattributes

---
 .gitattributes | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 83fdfce..58e3bf7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,26 +6,26 @@
 #   git config merge.ours.driver true
 # This tells git to ignore upstream files and keep local ones on merge.
 
-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
+index.toml ours
+pack.toml ours
+README.md ours
+config/fabric_loader_dependencies.json ours
+config/isxander-main-menu-credits.json ours
 
 # === BASE FILES
 # These are files added by the modpack.
 # Each derived modpack should have these files as is.
 # The git driver can be setup as:
 #   git config merge.theirs.name "Use theirs"
-#   git config merge.theirs.driver "sh -c 'cat \"$3\" > \"$2\"'"
+#   git config merge.theirs.driver "cp %B %A" # UNIX
+#   git config merge.theirs.driver "copy %B %A" # Windows
 # This tells git to replace local files with upstream ones on merge.
-# Note: this driver is UNIX-only.
 
-mods/* merge=theirs
-resourcepacks/* merge=theirs
-shaderpacks/* merge=theirs
-config/yosbr/config/* merge=theirs
-scripts/* merge=theirs
+mods/* theirs
+resourcepacks/* theirs
+shaderpacks/* theirs
+config/yosbr/config/* theirs
+scripts/* theirs
 
 # === OTHER FILES
 # All other files must be merged manually.

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 2/2] 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.