Setup Unity Prefab merging

[johnkslg]

Docs: https://docs.unity3d.com/Manual/SmartMerge.html Really basic tutorial: https://learn.unity.com/tutorial/working-with-yamlmerge#5feba6a2edbc2a69e6450f9c

[tomsseisums]

This needs a research beforehand!

The UnityYAMLMerge tool is a really cryptic one. It does something, but it's UX is wonky and I always am puzzled whether the result is correct.

The docs aren't really good either and there isn't much discussion/reviews/tutorials/case-studies about it in public domain.

[tomsseisums]

Some stuff I found before going to lunch:

• https://kihontekina.dev/posts/git_conflicts/
• https://www.andreasjakl.com/resoving-unity-scene-merge-conflicts-unityyamlmerge-tortoisegit/
• https://www.reddit.com/r/Unity3D/comments/39bdq5/how_to_solve_scene_conflicts_with_unitys_smart/

All posts mention setting up mergespecfile.txt to point to an actual tool, otherwise the tool will fail.

The reddit one also had author of the tool posting about this topic in Unity forums: https://forum.unity.com/threads/smart-merge-not-working.315903/

But it seems that dev activity in the forum has dropped off recently. 😟