From 7180b4f6ca3cc1534b93a16eb9371ff17c1cd6d9 Mon Sep 17 00:00:00 2001
From: Jeonghyeon Ha <jeonghyeon@hyphengames.com>
Date: Thu, 28 Aug 2025 19:12:38 +0900
Subject: [PATCH] =?UTF-8?q?gitattribute=20unity=20smart=20merge=20(unityYa?=
 =?UTF-8?q?mlMerge)=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitattributes | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index dcf545082..7f9492298 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,20 +9,22 @@
 *.uxml text
 *.uss text
 # --- Unity YAML 형식 에셋 (텍스트 기반) ---
-*.meta text merge=union eol=lf
-*.unity text merge=union eol=lf
-*.prefab text merge=union eol=lf
+# 병합 품질 향상을 위해 Unity Smart Merge 드라이버 사용
+*.meta   text merge=unityyamlmerge eol=lf
+*.unity  text merge=unityyamlmerge eol=lf
+*.prefab text merge=unityyamlmerge eol=lf
 *.asset filter=lfs diff=lfs merge=lfs -text
-*.mat text merge=union eol=lf
-*.anim text merge=union eol=lf
-*.controller text merge=union eol=lf
-*.overrideController text merge=union eol=lf
-*.mask text merge=union eol=lf
-*.lighting text merge=union eol=lf
-*.renderTexture text merge=union eol=lf
-*.timeline text merge=union eol=lf
-*.playable text merge=union eol=lf
-*.spriteatlasv2 text merge=union eol=lf
+*.mat    text merge=unityyamlmerge eol=lf
+*.anim   text merge=unityyamlmerge eol=lf
+*.controller          text merge=unityyamlmerge eol=lf
+*.overrideController  text merge=unityyamlmerge eol=lf
+*.mask                text merge=unityyamlmerge eol=lf
+*.lighting            text merge=unityyamlmerge eol=lf
+*.renderTexture       text merge=unityyamlmerge eol=lf
+*.timeline            text merge=unityyamlmerge eol=lf
+*.playable            text merge=unityyamlmerge eol=lf
+*.spriteatlasv2       text merge=unityyamlmerge eol=lf
+# 참고: 각자 로컬 Git에 merge.unityyamlmerge.driver를 등록해야 실제로 동작합니다.
 # --- Git LFS 관리 대상 바이너리 파일들 ---
 # 이미지
 *.png filter=lfs diff=lfs merge=lfs -text