I am using Unity Collab with my other team member to develop our game. After integrating the FireBase Database asset package, I noticed that he had made a change to the project. I then pulled his changes and since then I have a conflict in Unity in my Plugins/Android folder.
Right-Clicking on any of the folders marked red presents me with an option to Resolve Conflicts. Regardless if I click Take Theirs or Keep Mine - I am presented with an error stating “There are no valid assets to this operation on”. There are no files marked as having a conflict, only folders.
As an attempt to resolve this, I removed and re added the ‘Plugins’ folder. Now the only file marked red is the Assets Folder.
My Collab button in Unity in the top right is marked with a red exclamation mark but is otherwise blank (normally I would expect to see the files that are conflicted).
I have tried Reimport All assets but that hasn’t resolved my issue.