Error Trying to Merge Branches

[KnightFire]

I have an error when I'm trying to merge a branch and I'm not sure what to do to fix it. I resolved the conflicts but this error remains. Any help with this would be appreciated. 

[ollieblanks]

Can you check if UnityYAMLMerge.exe exists at that path?

Hope this helps!

[KnightFire]

I got past this by choosing to accept only the source changes. Not ideal but it got past the error. I have updated to the newest LTS version of Unity in order to hopefully avoid these issues in the future. For curiosity's sake though how do I change what path that Plastic looks for the UnityYAMLMerge.exe if it isn't looking in the correct spot?

 

[ollieblanks]

You can customise your Diff and Merge tools for different file types via Preferences > Diff Tools (and Merge Tools)

Hope this helps!

[KnightFire]

Alright so I know it's been a while but I'm still running into this error. I'd really like to be able to correct it the right way to stop having to merge things from source or destination then having to go in and fix the things that don't merge correctly. 

[blue]

@KnightFire Have you followed steps @ollieblanks suggested above?