Create new branch, can't switch to it without force update because of file changes not being tracked by VCS

Unity Services
,
1

Hi! I am experiencing an issue with Unity Version Control, and couldn’t find any solution to it.

I have my project with the branch “main”, all changesets are there. I decided to create a new branch called “itchio demo”, starting from the last changeset (so its contents are exacly the same as main). That’s everything fine.

Now, when switching my workspace to the new branch, it displays a popup indicating that the update operatin found issues. As seen in the following image:

Screenshot 2024-08-13 101309
Screenshot 2024-08-13 1013091912×715 45.4 KB

I clicked to “update forced” and I lost all the changes on those files (in fact, there were even more files but I didn’t took a screenshot in that moment).

So, there are various issues going on:

  1. I wasn’t able to switch my workspace to the new branch without doing a “update forced”, which is non-sense as I created it right in the latest changeset. It seems to be caused by point n’2. But in any case, we should be able to select an option to make our local files have authority instead of only allowing us by using “update forced”. Ot at least make a new commit with the files replaced. May I be missing something here?
  2. For some reason (which may be the root cause), those files are not being tracked by VCS. But they should! They are not private, they were not added to hidden_changes.conf, they are not being ignored neither.
  3. I was able to recover the files in the picture and reproduce the issue, by looking through VSCode’s local file changes and adding the code that was removed by the update. However I could only do so because the code was crashing due to missing methods called elsewhere. I couldn’t do that with the other files because they are not crashing.

In case you wonder, the changes affected by the operation are not even in the remote, (issue n’2). The files are there, but not the latest code changes, which were removed by the update operation and have the issue mentioned above.

Is there anything I can do? May I be missing something? Should I open a request for a feature to force local authority? How can I solve issue 2?

Btw, I did a backup before updating, but copy pasting the affected files every time I need to switch my workspace is not viable.

Unity Version Control’s version: 2.2.0
Unity Version: 2022.3.21f1

1 Like
2

I think this new feature will be useful for you " Improved Switch Experience with Pending Changes":

Please ket us know if it helps.

3

Hi! The link redirects to a 404 page. Is that correct?

4

Can you try this? Plastic SCM - Release Notes - 11.0.16.8845

1 Like