Remote workspace breaks: "Repository contains unmerged paths" | MCreator

MCreator issue tracker has been migrated to GitHub.

Existing tickets have been migrated to GitHub. Please open new tickets on the GitHub tracker instead. If you do not have a GitHub account, all feature requests and bug reports from forums are still considered and checked by the maintainers.

Status

Resolved

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.

Log in or register to post comments

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.

Log in or register to post comments

Published by

Recent forum topics

4

How do I make an entity float on water without bouncing on water?

Last update 1 hour 41 minutes ago

3

Entities join raids

Last update 1 hour ago

9

Create a team using an "Execute command" block

Last update 2 hours 52 minutes ago

0

Help with certain particles and relative coordinates in MCreator

Last update 3 hours ago

1

Help with fixing exploit in my mod.

Last update 4 hours 40 minutes ago

1

Can someone please help me with health boost

Last update 4 hours 36 minutes ago

1

multitool problems

Last update 4 hours 10 minutes ago

2

Custom button not opening door

Last update 5 hours 28 minutes ago