Search Issue Tracker
Fixed in 5.5.0
Votes
0
Found in
5.5.0b7
Issue ID
840622
Regression
No
[Collab] Launch external tool for merging a script conflict provides invalid parameters
Steps to reproduce:
1. open attached project
2. open collab tab and use the "Launch external tool" to merge Player.cs conflict
Expected: open merge software
Actual: throws and error window stating a bad parameter
Reproduced: 5.5.0b7
Comments (1)
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
- “FocusController has unprocessed focus events.” warnings are thrown after adding iOS, tvOS or visionOS Build Profiles
- Holes and different colors appear on default Tree Materials after applying them to the Tree GameObject and undoing changes
- Error indicating that the Text Asset Importer hasn't been disposed properly is logged when switching Importer Type in a Focused Inspector
- Documentation installation shows "Install failed: Validation Failed" when installing Android Build Support module
- Error indicating that the Package Manifest Importer hasn't been disposed properly is logged when switching Importer Type in a Focused Inspector
Crabby40
Mar 03, 2017 14:34
My students are having a lot of errors using the Collab feature. Most of the errors are associated with merging.