Is it possible to use the Unity merge tool called 'Smartmerge' or 'UnityYAMLMerge' with Unity Version Control (formerly known as Plastic SCM)?
The Unity Version Control Client comes with the 'UnityYAMLMerge' tool preconfigured. This tool is used by the Unity Version Control Client when a merge operation for a Prefab or Scene file happens. If SmartMerge requires manual conflict resolution, it will fall back to the regular Unity Version Control text merge tool. Meta files will use the Unity Version Control regular text merge tool too.
Things to note:
- The Unity SmartMerge configuration is hard-coded in Unity Version Control 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.
- If that happens, you will have to manually edit the SmartMerge path in Unity Version Control Merge Tool preferences. For more details on how to do this, please see the version control documentation.
Further details about Unity SmartMerge can be found in the Unity manual here..