Is there any way to set Rider as diff/merge tool when the collaboration feature is on?
I figured I might be able to set it up if I could specify a custom command line, but I can’t edit the dropdown:
there is a config file for merges at Unity.app/Contents/Tools/mergespecfile.txt but i don’t know whether collaboration makes use of it.
Another solution might be to trick unity to use a custom executable for one of the mentioned tools, in which you just pass the arguments in correct order to rider.
Add the Feedback tag to the thread title so maybe rider or a custom command gets added as an option in a future version of unity
1 Like
I tried updating the configuration file, but it didn’t help. I also tried editing the registry entry named kDiffsDefaultApp, but still no success.
+1 to being able to use Rider’s diff
+1 for Rider’s diff
Currently UnityEditorInternal.InternalEditorUtility.GetAvailableDiffTools doesn’t return Rider as a possible diff tool.
We need some extension point here.
Rider itself is ready to be used as a diff tool https://www.jetbrains.com/help/rider/Command_Line_Differences_Viewer.html
+1 plis?
In unity preferences, set tool path to rider64, and set “Two-way diff command line” to “diff #ABSLEFT #ABSRIGHT”
1 Like
Relevant link - Unity Collaborate Integration:
https://youtrack.jetbrains.com/issue/RIDER-7609