Remote workspace breaks: "Repository contains unmerged paths"

Not applicable
Issue description

Me and some of my friends are doing a project and when i try to sync it pops up an error saying "repository contains unmerged paths", although it works for anyone else. I'm not sure what to do and yeah im on the same version as everyone else is.

Issue comments

Sometimes this happens.

Clone the workspace again.

Also for the future make sure you don't both work on the same elements if possible.

Donate to MCreator

By donating to developers you can speed up development, as with more resources, we can dedicate more time to MCreator. It is a free project made by developers working on it in their free time.