diff --git a/.gitattributes b/.gitattributes index 928a2caf..aa76e949 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,7 @@ * text=auto # Unity files *.meta -text merge=unityyamlmerge diff -*.unity -text merge=unityyamlmerge diff +*.unity filter=lfs diff=lfs merge=lfs -text *.asset filter=lfs diff=lfs merge=lfs -text *.prefab -text merge=unityyamlmerge diff *.mat -text merge=unityyamlmerge diff @@ -99,4 +99,3 @@ Library/PlayerDataCache/Win64/Data/level0 filter=lfs diff=lfs merge=lfs -text Library/PlayerDataCache/Win64/Data/sharedassets0.assets filter=lfs diff=lfs merge=lfs -text Library/PlayerDataCache/Win64/Data/sharedassets0.assets.resS filter=lfs diff=lfs merge=lfs -text Assets/_PROJECT/Scenes/DeltaBuilding_base.unity filter=lfs diff=lfs merge=lfs -text -*.unity filter=lfs diff=lfs merge=lfs -text