Hi.
I have spammed merge few times, while had new incoming changes, then few window about merge opened. I used one, and did my merge then closed all windows. Now i have infinity message about there’s merge in progress. Reopening and rebooting my laptop didn’t help. My pc have 4gb ram and 1.1Ghz processor.
Now i can’t accept new incoming changes, and can’t check in. Help.
there’s 2 screenshots of error
can you open the branch explorer, run the merge from cset 215 again and resolve all the conflicts? After that, you should be able to update via incoming changes.
I got same error on another PC.
I did what you said, and now i get another error in Plastic SCM. In Unity i still have same error.
When i try to merge from 226, it says that:
https://imgur.com/a/zp9SNYp
And there’s no Diff/Merge setting that mentioned on screenshot in preferences.
I can’t check in, undo that make conflict, get incoming changes or resolve conflict.
https://imgur.com/a/kCBTml0
Still need help. Only one way that i found is to delete project and add as new. I’d like to use PlaticSCM without deleting project everytime.
Can you still reproduce the problem in your previous workspace? I would like to arrange a meeting to debug it.
Hi. Unfortunately i stopped project, and i’m not able to reproduce this error anymore because we don’t have any changes. Still we have some time little troubles with incoming changes.
Briefly describe the situation, sometimes when updates arrive, some scripts/scenes hang in incoming chages as modified objects (yellow icon) , and they cannot be accepted until the object is deleted on the destination computer, which makes it impossible to check in or merge with the object.
If I manage to get these errors again, I will try not to interact with the project until further instructions from you.
I hope your answers will not be delayed next time.
Hi @xxflecsoxx , for faster responses or if you are stuck, please open a ticket at devops-vcs-support@unity3d.com.
