koobas.hobune.stream
UnityYAMLMerge Error
Is there anyone that has been able to make UnityYAMLMerge work properly? I updated my .gitconfig to use UnityYAMLMerge but when there is a merge conflict it just crashes and outputs an error: 
couldn't locate merge tool to handle extension tmp
I looked in the mergespecfile.txt and updated the fallbacks as following :
unity use "C:\Program Files (x86)\Meld\Meld.exe" "%l" "%r" "%b" "%d"
prefab use "C:\Program Files (x86)\Meld\Meld.exe" "%l" "%r" "%b" "%d"
(meld is thus my fallback)
Am i misinterpreting anything here?
Best regards Joel
Hi,
Even I had the same issue. By adding the bellow lines , it worked for me.
unity use "%programs%\Meld\Meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge
prefab use "%programs%\Meld\Meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge
# Meld Merge
* use "%programs%\Meld\Meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge
I know I am answering to an one year old post. I thought this would help somebody if needed.
i had this issue. the above lines where i have to add to fix it. in manifest file or what?
This resolved my problem!
In case anyone sees this and has the same question, this change goes in mergespecfile.txt (C:\Program Files\Unity\Editor\Data\Tools)
this ain working, new answers pls.
