Hi, my project is in a weird state, I have pulled it from git because unity collab doesn’t include all my config files.So by using git alongside with collab, I am able to move my project from machine to machine and get all the config files too.
However, unity doesn’t recognize the files downloaded from git as identical to the ones in unity collab, giving me hundreds of conflicts, even tho when viewing diff the content of the files are exactly the same.
I can go by them one by one and in unity collab dropdown and select “choose theirs” to pull from unity collab, this rosolves a file. However, this takes about 30 seconds, And I have more then 350 conflicts, making this a major pain in the ass to do manually, I should have to pay attention in more than two hours doing nothing but clicking the same button every half minute.
Are there really no way of doing “do this for all items” → choose theirs?
Really. It would be a disaster easily.
It’s a very bad idea using two version control system side by side on the very same project. If you use git, use git and do not use Collab. Or vice versa.
If you don’t have local change at the moment, move out your files and download the project from Collab fresh.
Well. I don’t see why it would be a disaster. In git I would have the option to reset to head, or checkout all, I’m basically just looking for a way to do that in unity collabs version control.
The main problem would be inconsistency between repos, and you don’t know which one you should trust. If you are the only developer of your project, this isn’t a real problem, but if your project has two or more collaborators, you can easily get unwanted states and unwanted overwrites.