Search Issue Tracker

Won't Fix



Found in [Package]


Issue ID




[Collab] Grayed out context options when resolving a merge conflict

Package: Collab Proxy


1. What happened

After making local changes in a Collab-enabled project, saving those changes, then pulling a Collab update that resolves in a merge conflict in a different asset, the assets that have been modified but don't have a merge conflict will have a Conflict Resolution context menu option with all grayed out options.

When resolving merge conflicts, the Collaborate/Conflict Resolution context menu should not be visible for assets that don't have conflicts but have just been modified.

2. How we can reproduce it using the example you attached
A) Enable Collab for this project and sync between two instances.
B) Edit and save the Albedo value of the Blue material in both instances, being sure to save them as two conflicting values.
C) Publish changes made to Blue in one instance.
D) In the other instance, make a change in the SampleScene and save it. Then pull the latest changes in the Collab window. Expect a merge conflict.
E) Navigate to the modified SampleScene and right click on it.

Expected: No Collaborate/Conflict Resolution option is visible.
Actual: There is a Conflict Resolution context menu with all grayed out options.

Reproduced on 2020.1.2f1 with Collab v1.3.9, v2.1.0; 2019.4.4f1 with Collab v.1.2.16, v2.0.0 preview.23; 2018.4.23f1 with Collab v1.2.16, v2.0.0.

  1. Resolution Note:

    Minor UX issue that does not interfere with normal operation.

Add comment

Log in to post comment

All about bugs

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