Fail gracefully (or add merge support) for Unity Prefabs
Sometimes, two members of my team change the same Unity Prefab in different commits. This leads to a conflict when merging. It also triggers an error message - the merge tool can't open the file.
This is different from code-based conflicts (Plastic's Merge Tool opens, and works well).
If I fix the merge conflict before attempting to Auto Merge (i.e. right click on the prefab asset, and select "use mine" or "use theirs"), everything works as expected.
It would be nice if Plastic brought up a more helpful error message. Something like "we're working on a merge tool for [insert file types], but in the meantime, here's what to do..." Telling a user that the merge tool crashed can lead to confusion about the true cause of the problem.
For reference: Plastic SCM Cloud 18.104.22.16867 + Unity 2019.3