Search Issue Tracker
Fixed in 2020.2.X
Fixed in 2019.3.X, 2020.1.X
Votes
0
Found in
2019.1.0a11
2019.3
2019.3.4f1
2020.1
2020.2
Issue ID
1228574
Regression
Yes
Unclear error (The file '' seems to have merge conflicts...) is thrown when a Prefab has merge conflicts
How to reproduce:
1. Open the attached 'project-1228574.zip' project
2. Open the 'GameObject' prefab with a text editor
3. Add '<<<' somewhere in the file (for example, above the 4th line 'GameObject:')
4. Right-click in the Project Browser and select 'Reimport'
Expected result: the error is clear and contains the prefab's name
Actual result: the error is unclear and does not contain the prefab's name
Reproducible with: 2019.1.0a11, 2019.3.8f1, 2020.1.0b4, 2020.2.0a5
Not reproducible with: 2017.4.38f1 (Does not throw an error at all), 2018.4.20f1, 2019.1.0a10
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
- Resizing Profiler Module Details panel and releasing mouse button outside Unity doesn't cancel resize
- "Auto-hide gizmos" preference is not saved when reopening the project
- Sampling a custom depth texture on a machine with a GTX 1080 makes object's textures display the wrong color when in Play mode or Player
- Terrain is missing the Hidden/TerrainEngine/Details/WavingDoublePass shader when AssetBundles are built in older Unity Versions
- [Android] URP Project crashes when built on a device with PowerVR Rogue GE8320 GPU
Resolution Note (fix version 2020.2):
Fixed in 2020.2.0a8
Resolution Note (fix version 2020.1):
Fixed in 2020.1.0b8
Resolution Note (fix version 2019.3):
Fixed in 2019.3.14f1