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

Fixed .gitattributes

Browse source
This commit is contained in:
Malasaur 2025-11-17 10:22:30 +01:00
parent 80f9e73309
commit b14933ed96
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.gitattributes vendored
View file

@ -6,26 +6,26 @@
# 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 merge=ours index.toml ours
pack.toml merge=ours pack.toml ours
README.md merge=ours README.md ours
config/fabric_loader_dependencies.json merge=ours config/fabric_loader_dependencies.json ours
config/isxander-main-menu-credits.json merge=ours config/isxander-main-menu-credits.json ours
# === BASE FILES # === BASE FILES
# These are files added by the modpack. # These are files added by the modpack.
# Each derived modpack should have these files as is. # Each derived modpack should have these files as is.
# The git driver can be setup as: # The git driver can be setup as:
# git config merge.theirs.name "Use theirs" # 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. # This tells git to replace local files with upstream ones on merge.
# Note: this driver is UNIX-only.
mods/* merge=theirs mods/* theirs
resourcepacks/* merge=theirs resourcepacks/* theirs
shaderpacks/* merge=theirs shaderpacks/* theirs
config/yosbr/config/* merge=theirs config/yosbr/config/* theirs
scripts/* merge=theirs scripts/* theirs
# === OTHER FILES # === OTHER FILES
# All other files must be merged manually. # All other files must be merged manually.