Merge Tool by File Type with Support for UnityYAMLMerge

39 votes

Currently, there is only support for a single merge tool, which does not cater for different file types. As we work with Unity, for *.asset and *.prefab files Unity provide a UnityYAMLMerge.exe application to perform smart merges. This, of course, doesn't work for merges of code files.

If I follow the Unity docs (https://docs.unity3d.com/Manual/SmartMerge.html) and add their app to the .gitconfig, then GitKraken fails to find any repositories, so I now have to use SourceTree to perform merges when there are conflicts with asset and prefab files, in order to use the tool.

It would be a very useful and powerful feature to keep the `External Merge Tool` as the default choice, but to also allow the definition of file-type / content-type specific merge tools for special circumstances, where alternative tools exist.

Under consideration Suggested by: Richard Coleman (02 Sep, '21) • Upvoted: 13 Mar • Comments: 4

Comments: 4

21 Sep, '21
MatlabUser
Same thing for me and according diff tools: I'm working with Matlab and need the Matlab compare for Simulink Models (*.slx). I need a hex compare for autogenerated binary files (e.g. project files) and still arbitrary text compare. HG can handle this in mecurial.ini. I'd like to see some equvialent solution for git. No matter in .gitconfig or GitKraken.
22 Aug, '22
Omar Mohamed
Same problem, not sure why they have not added support for that yet
06 Sep, '22
Matt
I also really need this for unity as well it's almost a requirement for larger projects working in unity with a lot of people in parallel
08 Aug, '23
Justin Ciaralli
Tagging up on this, merge tools like UnityYAMLMerge are used commonly at my company. Would love to see this integrated.