diff --git a/.gitattributes b/.gitattributes index 83fdfce..875847e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,9 +17,9 @@ config/isxander-main-menu-credits.json merge=ours # 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