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
- Warning of an unknown Script missing is logged when selecting VFX in Play Mode
- Vertical and horizontal scrollbars appear and disappear when dragging an attribute to a different position within the Shader Graph Hierarchy
- AudioSource.PlayDelayed() does not work with Audio Random Containers
- Compatible with the VFX Graph Shader Graph can't be dragged and dropped into the "Output" block from the Project window
- [Silicon] Freeze/crash on BrotliDecoderDecompressStream when using System.IO.Compression.BrotliDecoder.TryDecompress
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