From e1fdd4051c495720b2b567c3d208d541f75b5092 Mon Sep 17 00:00:00 2001 From: Danil Iarosh Date: Thu, 16 Jul 2026 16:44:56 +0300 Subject: [PATCH] Configure UnityYAMLMerge for Unity text files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Обновлен .gitattributes: отключено LFS-отслеживание для сцен, префабов, ассетов, контроллеров анимации и т.д., чтобы они оставались текстовыми файлами в Git. - Включен драйвер слияния unityyamlmerge для всех YAML-файлов Unity. --- .gitattributes | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitattributes b/.gitattributes index e93e5f3..87b9ff6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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