I’ve been working on a VR project for some time now, everything was going great. One day suddenly I’ve opened the project and there was more than 800 changes, all of them in the library folder. I know it shouldn’t have happened something like this because I checked the “ignore” file in the project folder. But it happened anyway.
I’ve tried to check in those “changes” in the plastic because the project looked normal. But then I realized some prefabs went missing and some scripts got bugged. They were in the project folder, through the file explorer. But in the Project Tab, they disappeared. I downloaded an older version of the project that my company had because everything got so bugged. But then the plastic was already in the project and now it’s having conflict with the actual library. I can’t “keep source changes” because it gives this bug:
Please any help? It’s urgent!
Hi,
Does it make sense to have 856 directory conflicts? Doesn’t make more sense to undo the changes in your workspace and update it to the last avoiding all of these conflicts?
The error from the screenshot seems to be related to the fact that some files involved in the merge are locked by another program.
Can you download the Plastic SCM Cloud edition standalone client (www.plasticscm.com → Downloads). it normally helps to debug these kinds of problems and it should allow you to process the merge conflicts once the Unity editor is closed.
If the issue persists, please reach us at support@plasticscm.com and we can even arrange a meeting with you to debug the problem.
Regards,
Carlos.