Create a gist now

Instantly share code, notes, and snippets.

@kihira /.gitconfig Secret
Last active Jun 24, 2017

What would you like to do?
*.unity binary
*.prefab binary
*.asset binary
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"
### Unity ###
# Autogenerated VS/MD solution and project files
# Unity3D generated meta files
# Unity3D Generated File On Crash Reports

Does this attempt to merge ANY file using UnityYAMLMerge, or just *.unity, *.prefab and *.asset ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment