Is it possible to use the Unity merge tool called “Smartmerge” or “UnityYAMLMerge” with Plastic SCM?
The Plastic SCM Client comes with the “UnityYAMLMerge” tool preconfigured. This tool is used by the Plastic SCM Client when a merge operation for a Prefab or Scene file happens. If SmartMerge requires manual conflict resolution, it will fallback to the regular PlasticSCM text merge tool. Meta files will use the Plastic SCM regular text merge tool too.
Things to note:
- The Unity SmartMerge configuration is hard-coded in Plastic SCM configuration. We assume that, if you are managing .prefab and .unity files, you will likely have Unity & SmartMerge installed
- Attempting to merge a .prefab or .unity file will throw an error if the SmartMerge application does not exist in the expected install path: %ProgramFiles%\Unity\Editor\data\Tools\UnityYAMLMerge.exe
- If that happens, you will have to manually edit the SmartMerge path in Plastic SCM Merge Tool preferences. For more details on how to do this, please see here.
Further details about Unity SmartMerge can be found here.