Search Issue Tracker
Active
Votes
0
Found in
2019.4.40f1
2020.3.35f1
2021.3.4f1
2022.1.4f1
2022.2.0a17
Issue ID
UUM-6563
Regression
No
UnityYAMLMerge 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
- CollisionIgnore() resets all Colliders when resetting only one Collider
- URP Lens Flare is rendered in the wrong position when Render Graph Compatibility Mode is enabled and Render Scaling is not 0
- [Test Runner] Incorrect name under Window > Panel after project restart
- [iOS] Crash when using fallback fonts created at runtime
- Paragraph formatting in the the HDRP Sample Scene Tutorials is missing
Add comment