![Resoving Unity Scene Merge Conflicts with UnityYAMLMerge (Smart Merge) and TortoiseGit – andreasjakl.com Resoving Unity Scene Merge Conflicts with UnityYAMLMerge (Smart Merge) and TortoiseGit – andreasjakl.com](https://www.andreasjakl.com/wp-content/uploads/2017/07/tortoisegit-unityyamlmerge.png)
Resoving Unity Scene Merge Conflicts with UnityYAMLMerge (Smart Merge) and TortoiseGit – andreasjakl.com
![Resoving Unity Scene Merge Conflicts with UnityYAMLMerge (Smart Merge) and TortoiseGit – andreasjakl.com Resoving Unity Scene Merge Conflicts with UnityYAMLMerge (Smart Merge) and TortoiseGit – andreasjakl.com](https://www.andreasjakl.com/wp-content/uploads/2017/07/unityyamlmerge-extensiontmp.png)
Resoving Unity Scene Merge Conflicts with UnityYAMLMerge (Smart Merge) and TortoiseGit – andreasjakl.com
Support custom merge tool so that we can use Unity YAML merge automatically · Issue #10812 · desktop/desktop · GitHub
![Unity Smart Merge (UnityYAMLMerge.exe): how to configure vsDiffMerge.exe in the mergespecfile.txt? - Questions & Answers - Unity Discussions Unity Smart Merge (UnityYAMLMerge.exe): how to configure vsDiffMerge.exe in the mergespecfile.txt? - Questions & Answers - Unity Discussions](https://europe1.discourse-cdn.com/unity/original/3X/9/c/9c51ee9b5de7c272194f53f60aca9f98930cff01.png)