Kodo Posted October 19, 2020 Report Share Posted October 19, 2020 Good day, After reinstalling windows, when trying to merge, I get the following error: the plastic and unity version is the same. Link to comment Share on other sites More sharing options...
calbzam Posted October 19, 2020 Report Share Posted October 19, 2020 Hi, if you drive to Preferences --> Merge tools, do you have defined any custom merge tool for .prefab files? It seems a problem with the external perge tool (UnityYAMLMerge). Regards, Carlos. Link to comment Share on other sites More sharing options...
Kodo Posted October 19, 2020 Author Report Share Posted October 19, 2020 Yes I have: "C:\Program Files\Unity\Hub\Editor\2018.4.26f1\Editor\Data\Tools\UnityYAMLMerge.exe" merge -p "@basefile" "@sourcefile" "@destinationfile" "@output" Link to comment Share on other sites More sharing options...
calbzam Posted October 19, 2020 Report Share Posted October 19, 2020 Have you manually configured this tool as external merge tool, right? It seems the problem is this specific external merge tool is not able to handle this merge conflict. Are you facing this error for every merge conflict involving .prefab files or just this specific one? Regards, Carlos. Link to comment Share on other sites More sharing options...
Kodo Posted October 19, 2020 Author Report Share Posted October 19, 2020 I tried UnityYAMLMerge from different versions of the unity. So far only for this prefab. On another computer, by another user (the same version of plastic and unity), the merge was successful. Maybe I need to install some kind of library for windows. I don't know what the difference is. Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now