Add the .gitattributes to the Git repository. In order to use unityyamlmerge also add the following text to your .git or .gitconfig file:
[merge]
tool = unityyamlmerge
[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = '<path to UnityYAMLMerge>' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
| # 3D | |
| *.fbx filter=lfs diff=lfs merge=lfs -text | |
| *.FBX filter=lfs diff=lfs merge=lfs -text | |
| *.dae filter=lfs diff=lfs merge=lfs -text | |
| *.dxf filter=lfs diff=lfs merge=lfs -text | |
| *.obj filter=lfs diff=lfs merge=lfs -text | |
| *.blend filter=lfs diff=lfs merge=lfs -text | |
| *.lxo filter=lfs diff=lfs merge=lfs -text | |
| # Images | |
| *.bmp filter=lfs diff=lfs merge=lfs -text | |
| *.tif filter=lfs diff=lfs merge=lfs -text | |
| *.tga filter=lfs diff=lfs merge=lfs -text | |
| *.jpg filter=lfs diff=lfs merge=lfs -text | |
| *.png filter=lfs diff=lfs merge=lfs -text | |
| *.jpeg filter=lfs diff=lfs merge=lfs -text | |
| *.psd filter=lfs diff=lfs merge=lfs -text | |
| *.ai filter=lfs diff=lfs merge=lfs -text | |
| *.gif filter=lfs diff=lfs merge=lfs -text | |
| *.exr filter=lfs diff=lfs merge=lfs -text | |
| *.tga filter=lfs diff=lfs merge=lfs -text | |
| *.hdr filter=lfs diff=lfs merge=lfs -text | |
| *.pdf filter=lfs diff=lfs merge=lfs -text | |
| # Audio | |
| *.mp3 filter=lfs diff=lfs merge=lfs -text | |
| *.ogg filter=lfs diff=lfs merge=lfs -text | |
| *.wav filter=lfs diff=lfs merge=lfs -text | |
| *.aif filter=lfs diff=lfs merge=lfs -text | |
| *.mod filter=lfs diff=lfs merge=lfs -text | |
| *.it filter=lfs diff=lfs merge=lfs -text | |
| *.s3m filter=lfs diff=lfs merge=lfs -text | |
| *.xm filter=lfs diff=lfs merge=lfs -text | |
| # Text # | |
| *.txt text | |
| *.html diff=html text | |
| *.htm text | |
| *.xml text | |
| *.json text | |
| *.csv text | |
| *.yaml text | |
| *.cs diff=csharp text | |
| *.md diff=markdown text | |
| # Fonts | |
| *.fnt filter=lfs diff=lfs merge=lfs -text | |
| *.ttf filter=lfs diff=lfs merge=lfs -text | |
| *.otf filter=lfs diff=lfs merge=lfs -text | |
| *.ttc filter=lfs diff=lfs merge=lfs -text | |
| # Video | |
| *.asf filter=lfs diff=lfs merge=lfs -text | |
| *.avi filter=lfs diff=lfs merge=lfs -text | |
| *.dv filter=lfs diff=lfs merge=lfs -text | |
| *.m4v filter=lfs diff=lfs merge=lfs -text | |
| *.mov filter=lfs diff=lfs merge=lfs -text | |
| *.mp4 filter=lfs diff=lfs merge=lfs -text | |
| *.mpg filter=lfs diff=lfs merge=lfs -text | |
| *.mpeg filter=lfs diff=lfs merge=lfs -text | |
| *.ogv filter=lfs diff=lfs merge=lfs -text | |
| *.vp8 filter=lfs diff=lfs merge=lfs -text | |
| *.webm filter=lfs diff=lfs merge=lfs -text | |
| *.wmv filter=lfs diff=lfs merge=lfs -text | |
| # Unity Files # | |
| *.cginc text | |
| *.shader text | |
| *.mat merge=unityyamlmerge eol=lf | |
| *.anim merge=unityyamlmerge eol=lf | |
| *.meta merge=unityyamlmerge eol=lf | |
| *.asset merge=unityyamlmerge eol=lf | |
| *.prefab merge=unityyamlmerge eol=lf | |
| *.controller merge=unityyamlmerge eol=lf | |
| *.physicMaterial merge=unityyamlmerge eol=lf | |
| *.physicsMaterial2D merge=unityyamlmerge eol=lf | |
| *.bytes filter=lfs diff=lfs merge=lfs -text | |
| *.unity filter=lfs diff=lfs merge=lfs -text | |
| *.unitypackage filter=lfs diff=lfs merge=lfs -text | |
| # Plugins | |
| *.a filter=lfs diff=lfs merge=lfs -text | |
| *.dll filter=lfs diff=lfs merge=lfs -text | |
| *.aar filter=lfs diff=lfs merge=lfs -text | |
| # Misc | |
| *.zip filter=lfs diff=lfs merge=lfs -text | |
| *.tgz filter=lfs diff=lfs merge=lfs -text |