"Workspace has changed since last update" -- What is the current non-destructive solution?

Hello,

I ran into this issue today and can't download several updates from a teammate over the weekend. I have seen this thread and its suggestion, but wiping my teammates updates seems fairly extreme for a source control solution. Is there not a better method to pull down changes and get things straightened out?

There seemed to be a lot of questions about this for a while, and then that thread was the last big one around and it is now over a year old.

Any help is appreciated!

 

Well, I just did the fix listed in the other thread, and yes, my teammates changes were lost. Not an ideal fix.

 

I have the same problem, and of course, I don't want to lose my teammates works. What a mess is Unity