Nowadays, I keep switching between those configurations in SourceTree (when I need to merge scripts I put vsDiffMerge.exe, when I need to merge YAML I put UnityYAMLMerge.exe), but this is not productive and the mergespecfile.txt should work.īy the way, I could configured successfully p4Merge in mergespecfile.txt, but I prefer vsDiffMerge.exe :) The YAML merge (scene and prefabs) works well, but the problem is to launch the fallback tool for scripts.īy the way, if I configure the vsDiffMerge.exe directly in SourceTree like below it works well for the scripts (but for YAML not of course - I want to use the UnityYAMLMerge.exe for prefabs and scenes as the default merge tool, not vsDiffMerge.exe):ĭiff command = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsdiffmerge.exeĪrguments = "$LOCAL" "$REMOTE" "$BASE" "$MERGED" //m In SourceTree, I have the UnityYAMLMerge.exe correctly configured:ĭiff command = C:\Program Files\Unity\Editor\Data\Tools\UnityYAMLMerge.exeĪrguments = merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED" The second command does just the diff (not the merge operation - more information here) and I tried to add the //m in the end, but same thing, it just does the diff. * use "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsdiffmerge.exe" "%r" "%l" "%b" "%d" * use "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsdiffmerge.exe" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" //m ![]() ![]() I tried to configure it in mergespecfile.txt as: I am using GitHub as my repository and I want to use vsDiffMerge.exe as my fallback merge tool.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |