*.mp3 filter=lfs diff=lfs merge=lfs -text *.flac filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text *.wav filter=lfs diff=lfs merge=lfs -text *.tif filter=lfs diff=lfs merge=lfs -text *.bytes filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text *.psb filter=lfs diff=lfs merge=lfs -text # PSB meta files contain bone/sprite import data and can be very large *.psb.meta filter=lfs diff=lfs merge=lfs -text *.ttf filter=lfs diff=lfs merge=lfs -text # Exclude pre-existing font files that were committed as blobs (not LFS pointers) src/main/csharp/**/GUI[[:space:]]Pro[[:space:]]Kit*/**/*.ttf !filter !diff !merge src/main/csharp/**/Modern[[:space:]]UI[[:space:]]Pack/**/*.ttf !filter !diff !merge *.herodata filter=lfs diff=lfs merge=lfs -text *.ogg filter=lfs diff=lfs merge=lfs -text *.tga filter=lfs diff=lfs merge=lfs -text *.fbx filter=lfs diff=lfs merge=lfs -text *.FBX filter=lfs diff=lfs merge=lfs -text *.pdf filter=lfs diff=lfs merge=lfs -text # Third-party asset packs: track all files via LFS (never manually edited) src/main/csharp/**/DungeonMonsters2D/** filter=lfs diff=lfs merge=lfs -text src/main/csharp/**/Raccoon/** filter=lfs diff=lfs merge=lfs -text src/main/csharp/**/Polytope[[:space:]]Studio/** filter=lfs diff=lfs merge=lfs -text src/main/csharp/**/RRFreelance-Characters/** filter=lfs diff=lfs merge=lfs -text src/main/csharp/**/Dragon/** filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text # Unity Smart Merge - use UnityYAMLMerge for Unity files # Requires configuring unityyamlmerge in ~/.gitconfig: # [merge] # tool = unityyamlmerge # [mergetool "unityyamlmerge"] # trustExitCode = false # cmd = '/Applications/Unity/Hub/Editor/*/Unity.app/Contents/Tools/UnityYAMLMerge' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED" *.unity merge=unityyamlmerge *.prefab merge=unityyamlmerge *.asset merge=unityyamlmerge *.mat merge=unityyamlmerge *.anim merge=unityyamlmerge *.controller merge=unityyamlmerge *.physicsMaterial2D merge=unityyamlmerge *.physicMaterial merge=unityyamlmerge