Search Unity

Feedback Using Rider As Diff/merge Tool When The Collaboration Feature Is On

Discussion in 'External Tools' started by marpe, Apr 12, 2019.

  1. marpe

    marpe

    Joined:
    Nov 17, 2014
    Posts:
    3
    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:
    unity.PNG
     
  2. MrMatthias

    MrMatthias

    Joined:
    Sep 18, 2012
    Posts:
    157
    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
     
    marpe likes this.
  3. marpe

    marpe

    Joined:
    Nov 17, 2014
    Posts:
    3
    I tried updating the configuration file, but it didn't help. I also tried editing the registry entry named kDiffsDefaultApp, but still no success.
     
  4. XRA

    XRA

    Joined:
    Aug 26, 2010
    Posts:
    187
    +1 to being able to use Rider's diff
     
  5. jcsopko

    jcsopko

    Joined:
    May 14, 2013
    Posts:
    13
    +1 for Rider's diff
     
  6. IvanShakhov

    IvanShakhov

    Joined:
    May 19, 2016
    Posts:
    31
    Last edited: Sep 12, 2019