Malasaur/RetardsModpack
1
0
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity Actions

Fixed .gitattributes again

Browse source
This commit is contained in:
Malasaur 2025-11-17 10:26:51 +01:00
parent b14933ed96
commit 91939e7ac9
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.gitattributes vendored
View file

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