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

Updated .gitattributes

Browse source
This commit is contained in:
Malasaur 2025-11-17 22:20:50 +01:00
commit a3a3b86d39
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitattributes vendored
View file

@ -17,9 +17,9 @@ config/isxander-main-menu-credits.json merge=ours
# 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/* merge=theirs
resourcepacks/* merge=theirs resourcepacks/* merge=theirs