So i my friend clicked "Checkin changes" and everything worked. However when i try to take the incoming change a conflict appears. I click resolve conflict and it gives me an error:
Error in merge tool "C:\Program Files\Unity\Editor\data\Tools\Unity\YAMLMerge.exe" merge -p "@basefile"@sourcefile""@destinationfile""@output" excecution. Merge tools in client.conf are incorrectly defined.
I am fairly certain that the error has to do with Plastic SCM looking in a file location that doesn't exist. There is no folder called Unity in my Program files. How do i resolve this issue/change the location?
↧