iwnc2020/ProjectDDD
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitattribute unity smart merge (unityYamlMerge) 추가

Browse Source
This commit is contained in:
Jeonghyeon Ha 2025-08-28 19:12:38 +09:00
parent cc86bd6427
commit 7180b4f6ca
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitattributes vendored
View File

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