-
-
Save kihira/6a5f8daf4089772ba73f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
*.unity binary | |
*.prefab binary | |
*.asset binary |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[merge] | |
tool = unityyamlmerge | |
[mergetool "unityyamlmerge"] | |
trustExitCode = false | |
keepTemporaries = true | |
keepBackup = false | |
path = <Unity Install Location>/Editor/Data/Tools/UnityYAMLMerge.exe | |
cmd = \"<Unity Install Location>/Editor/Data/Tools/UnityYAMLMerge.exe\" merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Unity ### | |
/[Ll]ibrary/ | |
/[Tt]emp/ | |
/[Oo]bj/ | |
/[Bb]uild/ | |
# Autogenerated VS/MD solution and project files | |
*.csproj | |
*.unityproj | |
*.sln | |
*.suo | |
*.tmp | |
*.user | |
*.userprefs | |
*.pidb | |
*.booproj | |
# Unity3D generated meta files | |
*.pidb.meta | |
# Unity3D Generated File On Crash Reports | |
sysinfo.txt | |
*.orig |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Does this attempt to merge ANY file using UnityYAMLMerge, or just
*.unity
,*.prefab
and*.asset
?