Search Issue Tracker
Fixed in 2018.1.X
Votes
0
Found in
2018.2.0a1
Issue ID
1005245
Regression
No
[investigate] [YAMLMerge] Incorrect merge result when merging prefab
Steps to reproduce:
0. Setup perforce server
1. Open attached project
2. Enable VCS and submit project to server
3. Pull and open same project on another machine too
4. On first machine, drag GameObject prefab to hierarchy
5. Duplicate Cube object so now GameObject would have Cube and Cube (1) children
6. Move Cube (1) to different transform position and apply changes to prefab
7. Do steps 4 - 6 on second machine too
8. Back on first machine, submit changes to remote machine
9. Now on second machine, submit prefab changes too - notice merge conflict which is expected
10. Resolve conflict using semantic and merge tool option
11. On second machine, notice that now prefab hierarchy is:
GameObject
Cube
Cube <- this doesn't seem right, Cube (1) is expected
Cube (1)
Note, doing same steps on scene files instead of prefabs produces expected hierarchy layout:
GameObject
Cube
Cube (1)
Cube (1)
Reproduced with: 5.6.4p3, 2017.3.1p2, 2018.2.0a1
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- Crash on "The GUID inside 'Assets/asset.png.meta' cannot be extracted by the YAML Parser." when opening the project
- Shadows disappear when looking at a certain angle in Scene view and using Cloud Shadows with Volumetric Clouds
- StackOverflowException freezes or silently crashes the Editor
- Microsoft Surface Device freezes when detaching and reattaching physical keyboard attachment to a Microsoft Surface device in Standalone Player for Windows
- Shadows are cast with artifacts on GameObjects when the light type is set to Point
Add comment