diff --git a/.gitattributes b/.gitattributes
index f8bd8097a..c46df87f7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,54 @@
-# Unity text assets - force CRLF
-*.meta text eol=crlf
-*.unity text eol=crlf
-*.prefab text eol=crlf
-*.asset text eol=crlf
\ No newline at end of file
+# --- 기본 텍스트 설정 ---
+* text=auto
+
+# --- Unity YAML 파일 (충돌 병합 가능) ---
+*.meta       merge=union eol=lf text
+*.unity      merge=unityyamlmerge eol=lf text
+*.prefab     merge=unityyamlmerge eol=lf text
+*.asset      merge=unityyamlmerge eol=lf text
+*.mat        merge=unityyamlmerge eol=lf text
+*.anim       merge=unityyamlmerge eol=lf text
+*.controller merge=unityyamlmerge eol=lf text
+*.overrideController merge=unityyamlmerge eol=lf text
+*.physicMaterial2D merge=unityyamlmerge eol=lf text
+*.physicsMaterial merge=unityyamlmerge eol=lf text
+
+# --- Git LFS 적용 파일 (바이너리) ---
+# 3D 모델
+*.fbx         filter=lfs diff=lfs merge=lfs -text
+*.obj         filter=lfs diff=lfs merge=lfs -text
+*.blend       filter=lfs diff=lfs merge=lfs -text
+
+# 이미지 및 텍스처
+*.png         filter=lfs diff=lfs merge=lfs -text
+*.jpg         filter=lfs diff=lfs merge=lfs -text
+*.jpeg        filter=lfs diff=lfs merge=lfs -text
+*.tga         filter=lfs diff=lfs merge=lfs -text
+*.gif         filter=lfs diff=lfs merge=lfs -text
+*.bmp         filter=lfs diff=lfs merge=lfs -text
+*.psd         filter=lfs diff=lfs merge=lfs -text
+*.exr         filter=lfs diff=lfs merge=lfs -text
+
+# 오디오
+*.wav         filter=lfs diff=lfs merge=lfs -text
+*.mp3         filter=lfs diff=lfs merge=lfs -text
+*.ogg         filter=lfs diff=lfs merge=lfs -text
+
+# 비디오
+*.mp4         filter=lfs diff=lfs merge=lfs -text
+*.mov         filter=lfs diff=lfs merge=lfs -text
+*.webm        filter=lfs diff=lfs merge=lfs -text
+
+# 폰트
+*.ttf         filter=lfs diff=lfs merge=lfs -text
+*.otf         filter=lfs diff=lfs merge=lfs -text
+
+# 기타
+*.dll         filter=lfs diff=lfs merge=lfs -text
+*.unitypackage filter=lfs diff=lfs merge=lfs -text
+*.zip         filter=lfs diff=lfs merge=lfs -text
+*.7z          filter=lfs diff=lfs merge=lfs -text
+
+# --- Windows용 스크립트 (CRLF) ---
+*.bat         text eol=crlf
+*.cmd         text eol=crlf