Unity Issue Tracker - Tool is not detecting conflicts in prefab instances
Closed
UUM-17918
Tool is not detecting conflicts in prefab instances
Unity: Version Control
YAMLMerge
Won't Fix
6.5.X
6.4.X
6.3.X
6.2.X
6.1.X
6.0.X
Cancelling: the 6000.1 version has reached its end of life. If you need additional fixes, please upgrade to a newer Unity version.
How to reproduce:
Download and extract the user-attached “bug.zip“ file
In each of the provided example directories modify the command in the CommandLine.txt file by doing the following:
Replace the Editor location with the Unity Editor's locations on your machine
Replace all the instances directing to “mergebug.log“ and the test prefabs to the extracted folder’s specific example’s location
Run the commands in each of the “CommandLine.txt” files
Check the generated “mergebug.log“ in each of the examples
Expected result: The log should have a conflict in all three cases
Actual result: The result prefab has both modifications in all three cases, and the log shows no conflicts. In the component case, it adds the component twice
When using a VCS, the system does not detect the conflicts properly when two or more users modify the same prefab instance
All the modifications are stored in the YAML and executed when deserializing the asset. Making only the latest to be persisted or displayed, but it never identifies this case as a conflict
Prioritise and Follow this issue
Have a workaround or additional info about this issue?