mirror of
https://github.com/nolen777/eagle0.git
synced 2026-07-28 22:35:42 +00:00
60a147e31c
- Fix layout of Organize Troops panel - Add Unity Smart Merge (.gitattributes) for better merge handling of Unity scene files (.unity, .prefab, .asset, etc.) Note: To use Smart Merge, developers need to configure their ~/.gitconfig: [merge] tool = unityyamlmerge [mergetool "unityyamlmerge"] trustExitCode = false cmd = '/Applications/Unity/Hub/Editor/*/Unity.app/Contents/Tools/UnityYAMLMerge' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED" Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
30 lines
1.2 KiB
Plaintext
30 lines
1.2 KiB
Plaintext
*.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
|
|
*.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
|
|
|
|
# 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
|