Skip to content

Instantly share code, notes, and snippets.

@kihira

kihira/.gitconfig Secret

Last active June 24, 2017 05:07
Show Gist options
  • Star 2 You must be signed in to star a gist
  • Fork 2 You must be signed in to fork a gist
  • Save kihira/6a5f8daf4089772ba73f to your computer and use it in GitHub Desktop.
Save kihira/6a5f8daf4089772ba73f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitconfig
[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"
@evitolins
Copy link

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