[Solved] Collaborate reporting conflicts without reason

Hello,

we are working on a 3 member team and all three using Unity 2017.3.1f1 in mac environment.

We experience conflicts in almost any situation, for example:

1. Member 1 change object A position, saves and publish changes
2. Member 2 change object B position and saves. When try to publish asks to download changes first.
3. Download the changes and then a conflict in red is shown

Don't knows how to handle the changes which are made in completely different entities and we have to loose one version or the other.

This happens all the time and makes the system almost unusable for us. We understand that there may be a special reason why is not working.

We have worked in the past completing 2 VR projects without any problems.

Thanks for your help

Josep

 

Same here. Any solutions?

 

Hi @josepCGPills and @edencakir! Going from what you're describing you should not be encountering any merge conflicts. If you could submit a repro project via the Unity Bug Reporter and notify me with your bug number then that would go a long way in helping us to find why your particular changes are triggering conflicts. You can also get in touch with our Support team here for additional assistance.

 

Hey thanks for the quick reply @ryanc-unity . I just nuked Temp and Collab folders and toggled Collaboration service. I don't see any conflicts now. Will keep posting the updates.

 

This worked like a charm. Hope this helps future visitors.