We are using Unity VCS with LTS 2021.3.42f1. I have a large group of changes I am trying to check in, but cannot. On my Pending Changes tab, there is a “merge link description” box which I’ve never seen before.
If I click “Update Workspace”, I get a brief popup “Resolving packages…” and then, nothing happens. Both tabs remain the same.
I’ve also tried opening up the Plastic standalone app. Here, in “Incoming Changes”, I can see “0/0 files in conflict with your changes”. If I try to check in from the standalone app, it once again takes me to the “Incoming Changes” tab, saying that I cannot complete the check in because I have to pull incoming.
I have tried restarting Unity and Unity Hub.
The game is shipping on September 17th. I urgently need to find a solution to this. Thanks in advance
If it’s an urgent issue, please open a support ticket with us at devops-vcs-support@unity3d.com. If you are stuck, we can arrange a meeting and try to debug the problem.
The merge links appear because, at some point, a merge from changeset cs:5214 happened in this workspace.
If you click on the “Update workspace” button, aren’t you able to update the workspace and then submit your changes?
Posting here because we worked with support with weeks on this with no solution, eventually stumbling on a fix minutes ago.
In the Incoming Changes area there is an options in the top right. If you change this from the top option (something about merging) to the option that says always select source, then hit update, you will be able to move forward.
Wish I’d taken a screenshot of this view, but I didn’t expect this to work. Hope this helps someone out there stuck with this same issue!
