Search Issue Tracker

Fixed in Unity 2018.2

Votes

0

Found in

2017.1.0p2

Issue ID

943254

Regression

Yes

Collaborate tab freezes on 100% when merging with deleted files

Collab

-

-

Priority: 2Necessary for shipping a final release

-

Severity: 3Secondary functionality broken

To reproduce:
1. Create a new project on first machine
2. Make 10 Cube prefabs and save the scene
3. Commit changes
4. Download the changes to the second machine
5. Delete the prefabs ant meta files from the Projects Assets folder on second machine (not from the editor)
6. Make a change on all the prefabs on first machine and publish the changes
7. On second machine update the project

Expected result: collaboration tab shows Merge Conflicts
Actual result: Collaboration tab shows 100% and, the circle is not complete and the tab is frozen

Reproduced on: 5.6.0b11 2017.1.0f3 2017.2.0b11 2017.3.0a7
Not reproduced: 5.5.4p4 5.6.0a3 5.6.0b7 5.6.0b9
Regression on: 5.6.0b10

Notes: on 5.6.3p3 these steps produces blank collab tab.

On 2017.2.0b11 second machine updates normally, but on the first machine updating it result in the conflict and collab tab freezes

All about bugs

View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.