Question by TuRtoise · Jun 10, 2018 at 11:53 AM · visual studio git merge

How to pass additional config to 'mergespecfile'

Hello,

I am trying to configure my local git repository to work well with unity, and I feel like I got stuck on the very last step.

I have already changed the necessary Editor options (Visible Meta Files, Force Text) and modified .git/config as advised here: https://docs.unity3d.com/Manual/SmartMerge.html

I've set Unity-specific .gitignore as well. So far so good.

Now the problem appears when I try to set up Visual Studio as a merge Fallback tool in Unity's 'mergespecfile'.

So far the file has the default first line and the necessary settings:

 unity use "C:\my\path\to\the\tool\...\vsDiffMerge.exe" "%r" "%l" "%b" "%d" //m    
 prefab use "C:\my\path\to\the\tool\...\vsDiffMerge.exe" "%r" "%l" "%b" "%d" //m    
 * use "C:\my\path\to\the\tool\...\vsDiffMerge.exe" "%r" "%l" "%b" "%d" //m

The only problem is that when specified directly in .git/config, vsDiffMerge works flawlessly. But when called by UnityYAMLMerge in case of an automatic merge failure - not so much.

So the question is: how do I modify Unity's mergespecfile to match the very same state as if VS was set in git directly?

Here's the link to the .git/config I found and use to make it work as a standalone tool.

https://gist.github.com/alkampfergit/46883dcef9fb4bee39a56ce0e69dcf24

Add comment