Once in a while I’d be working in Unity and Unity would crash. When it crashes and I come back to unity and it will tell me that I have a few change sets that I need to update. This is not right, because these change sets are already up to date locally. That’s fine, I can just click update and nothing will update and it will now know that I’m up to date and I can continue to work.
The problem is when I have local changes(e.g. 50+ classes and or assets) that I have not committed yet, then the above happens. Then I cannot commit my current local changes because Unity thinks there are conflicts so I’m forced to update. When this happens I’m forced to go through a few hundred files to decide if I want to ignore server changes or override local etc.
Pressing Ignore server changes on every single file will resolve the conflict but it will come back and bite you in the butt later. How? Well, every file that I press “Ignore server”, it will no longer be marked as locally changed. So basically now Unity thinks that I don’t have any local changes, even though I have modified 50+ files. The only way to commit these changes is if I know off the top of my head which ones I changed, and I go and do something to make it different(e.g. adding a space in the c# file) so Unity will know it’s changed, then I can submit, or else Unity thinks I got nothing to submit.
That’s a big problem because if I missed any of those files, my team members would not ever know it until I modify the file again later(which who knows when it would be). If my machine is broken and I wanna recover my work, the files that I missed would not be on the server thus I lost work.
So far this has happened a few times and for me to be 100% sure all my changes are submitted to the server I had created a brand new project in the server and switching my Unity to point that new project and checking everything in like a new project. Which sucks because I lost all the history. I am sure I am missing something because no one else on this forum has complained about this.
Does anyone who knows what I’m talking about have anything to share?
Thanks!