Unity VCS / Plastic is in a bad merge state, cannot do anything, shipping in 4 days

Unity Services
,
1

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.

Merge link
Merge link1066×197 8.1 KB

If I try to check in my changes, the UI immediately switches to the “Incoming Changes” tab which looks like this.

Incoming Changes
Incoming Changes1888×467 39.9 KB

If I right click on this file, I don’t see my typical merge options.

Dropdown
Dropdown830×190 13 KB

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

2

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?

3

Per my original post, if I clicked “Update Workspace”, teh UI would refresh and absolutely nothing happened. The state did not change.

I was able to ‘solve’ this by deleting the .mat file completely. Once I did that, I was able to update the workspace and proceed.