Search Issue Tracker
Won't Fix
Votes
0
Found in
2018.4
2019.3.15f1
2021.1
Issue ID
1276043
Regression
No
Breaking merge conflicts when creating a nested prefab while the parent prefab has been modified somewhere else
How to reproduce:
1. Create a new Unity project on the master, create prefab A. Create a few children on this prefab.
2. Checkout to new branch_one, modify something on a child of A.
3. Checkout back to master, check out to new branch_two, and create a prefab B from the same child that was modified in step 2, which will become a nested prefab.
4. Checkout back to master, check out to new branch_merge.
5. Merge in branch_one
6. Merge in branch_two
Actual result: "UnityYAMLMerge error" appears
Expected result: Conflict is resolved successfully
Reproducible with: 2018.4.28f1, 2019.4.13f1, 2020.1.11f1, 2020.2.0b9, 2021.1.0a2
Notes:
- This project needs UnityYAMLMerge to reproduce
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
- “Remove Unused Overrides” available on not loaded Scene and throws “ArgumentException: The scene is not loaded” warning
- Adaptive Probe Volume occlusion edge is calculated incorrectly when viewing probes near geometry edges
- Sampling a texture using an HLSL file throws shader errors and the code does not compile
- "Graphics.CopyTexture called with null source texture" error when Base Camera of an Overlay Camera is removed with DX11 Graphics API and Compatibility Mode enabled
- WebGL sends wrong value with large numbers when SendMessage function is used
Resolution Note:
There is no capacity to add this feature to the existing UnityYAMLMerge tool. A new tool for merging is in active development.