Configure UnityYAMLMerge for Unity text files
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled

- Обновлен .gitattributes: отключено LFS-отслеживание для сцен, префабов, ассетов, контроллеров анимации и т.д., чтобы они оставались текстовыми файлами в Git.
- Включен драйвер слияния unityyamlmerge для всех YAML-файлов Unity.
This commit is contained in:
Данил Ярош 2026-07-16 16:44:56 +03:00
parent ecfd7d5469
commit e1fdd4051c

16
.gitattributes vendored
View File

@ -1,4 +1,4 @@
# Unity LFS tracking
# Unity LFS tracking for binary assets
*.png filter=lfs diff=lfs merge=lfs -text
*.psd filter=lfs diff=lfs merge=lfs -text
*.psb filter=lfs diff=lfs merge=lfs -text
@ -34,8 +34,12 @@
*.mp4 filter=lfs diff=lfs merge=lfs -text
*.mov filter=lfs diff=lfs merge=lfs -text
# Unity lockable files (LFS with lockable attribute)
*.unity filter=lfs diff=lfs merge=lfs -text lockable
*.prefab filter=lfs diff=lfs merge=lfs -text lockable
*.asset filter=lfs diff=lfs merge=lfs -text lockable
*.controller filter=lfs diff=lfs merge=lfs -text lockable
# Unity Text Files - Smart Merge
*.unity merge=unityyamlmerge text
*.prefab merge=unityyamlmerge text
*.asset merge=unityyamlmerge text
*.controller merge=unityyamlmerge text
*.physicMaterial merge=unityyamlmerge text
*.physicsMaterial2D merge=unityyamlmerge text
*.mat merge=unityyamlmerge text
*.anim merge=unityyamlmerge text