I’m using PlasticSCM5, which is accessible from my path, and thus usable as a fallback. It shouldn’t matter which fallback I’m using so long as it’s configured properly in the mergespecfile.txt.
When I run the SmartMerge directly from a command line tool, I get no errors.
The resulting merge content is simply:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
The command used is:
.\UnityYAMLMerge.exe merge -p -i .\mergeresolving.txt -o "C:\Merge\wat"
--rules .\mergerules.txt
--fallback .\mergespecfile.txt
"C:\Merge\PlayerCharacter.prefab#2140.prefab"
"C:\Merge\PlayerCharacter.prefab#2156.prefab"
"C:\Merge\PlayerCharacter.prefab#2166.prefab"
"C:\Merge\Merged.prefab"
The numbers are in chronological order, so #2040 is the ancestor, where the others are the candidates to merge.
I’ve added extra flags and tried to make it as verbose as possible, but no results. The output file is just as blank:
Conflicts:
Conflict handling:
I’m not sure what to do at this point. Getting any merge tool will do the job, of course - but it will corrupt the file because it needs that YAML context that SmartMerge is supposed to figure out.
What am I missing here? I’m providing the files I’m using. Can someone show me how it’s done?
I’m using Unity 2019.3.4f1.
5999078–645722–Merge.zip (45.2 KB)