koobas.hobune.stream
Unity Github missing prefabs after merge
I updated the Main branch from branch B and merged it. gitignore : [Ll]ibrary/ [Tt]emp/ [Oo]bj/ [Bb]uild/ [Bb]uilds/ [Ll]ogs/ [Uu]ser[Ss]ettings/
Conflicts were resolved and merged when updating Main in branch B. When I entered the scene, most of the references were broken, so even though I did reimport all, it was the same.. Everything on the scene is a Prefab.
Summary: I updated Main from branch B and merged it. Even if you do reimport all , many references are broken.
So you're not missing prefabs, just asset connections? That usually happens when your two versions are desync in terms of asset ids. When you create an asset you should never ever loose the associated metadata file. If you do, Unity will generate a new one with a new GUID. From that point on those assets will be completely new and seperate assets. We can't really help you debugging here. You said you had merge conflicts that you resolved. That's already a bad sign. Git is great when it comes to merging. If there are actual conflicts it usually means someone may have messed something up.
You may want to checkout each of the branches seperately and see what differences there are. Especially check the ID in the meta files of your assets. They have to be the same on all machines.
