Search Issue Tracker
Active
Under Consideration for 6000.0.X
Votes
1
Found in
6000.0.5f1
7000.0.0a1
Issue ID
UUM-17918
Regression
No
[YAMLMerge] Tool is not detecting conflicts in prefab instances
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
Reproducible with: 2019.4.39f1, 2020.3.35f1, 2021.3.4f1, 2022.1.4f1, 2022.2.0a17
Reproducible on: Windows 10
Notes:
# 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
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- "One or more data file missing for baking set NewScene Baking Set. Cannot load shared data." error in Player when a specific project is built
- Choosing new HDR Colour using RGB values breaks colour on Intensity Selectors
- Rendering/Decal Layer Mask options are different inside Prefab Mode and outside Prefab Mode when the project is upgraded to Unity 6
- Incorrect Realtime GI Light Probes baking when more than one Light Probe Group is used and "Baked Global Illumination" is enabled
- Hovering on the three-dot menu also highlights the tab header near it when not all tabs fit the bar
Add comment