I searched through the threads and couldn’t find anything that fixed my issue, I apologize if this has been solved previously.
I switched to a previous version control changeset due to some bugs in the current version I couldn’t fix. When I switched to the previous version, all of the file changes I did not want to keep show up in incoming changes. I was able to ignore them until a file conflict won’t allow me to commit my pending changes without updating my workspace with the incoming changes, which I do not want to do. I tried undo unchanged and undo changes on the conflicting pending changes files, but it did not help. Any assistance would be appreciated.
Hi @Swansocl,
Thank you for reaching out to us.
Did you have pending changes while you were on the latest changeset and then switch the workspace to the previous version with the pending changes keeping on?
Would you like to switch your workspace to the previous one by not keeping the pending changes?
Hello,
It made me commit my pending changes before switching the workspace to a previous version. The pending changes it made me commit are now the incoming changes I don’t want. So now I’m not sure how to discard those incoming changes, because a file conflict is preventing me from committing anything else.
Could I use the branch explorer to delete the changeset with the incoming changes? I’m concerned about losing any progress I’ve made since that time.
Ok, I fixed it. I’m dumb and thought the ‘branch explorer’ was not important for me because I didn’t have any branches at the time. It turns out it was the only way I could figure out to delete the changeset that contained the files I did not want to keep and that were conflicting with my pending changes.
To access branch explorer: Unity version control->pending changes tab (with branches tab closed)->click the branch icon in the image below and choose ‘branch explorer.’
The second image highlighted the location of the changeset I needed to delete. I backed up my project to another version control manager before doing it just in case. I just right-clicked and deleted. Issue solved.
