Search Issue Tracker
Won't Fix
Votes
1
Found in
6000.0.5f1
6000.1.0a7
6000.2.0a1
6000.3.0a1
6000.4.0a1
6000.5.0a1
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
Add comment
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- "Customize handled extensions" part in the External Tools settings tab is not aligned with other properties
- Editor Diagnostics foldouts do not open when clicked on the foldout title
- [UI Builder] Visual Elements are not placed at the mouse cursor position when Absolute Position Placement is enabled
- "Width" and "Height" text is misaligned with slider ends in Screen Match Mode Parameters section of Panel Settings Asset
- Editor does not quit when Editor is not in focus and any floating window is opened
Resolution Note:
This issue will be revisited in 6 months. Closing it for now.