Search Unity

  1. Welcome to the Unity Forums! Please take the time to read our Code of Conduct to familiarize yourself with the forum rules and how to post constructively.
Unity's version control component has been upgraded to Plastic SCM.

How to set diff/merge tool (help me)

Discussion in 'Unity Collaborate' started by deynekos1488, Sep 1, 2021.

  1. deynekos1488

    deynekos1488

    Joined:
    Mar 20, 2019
    Posts:
    14
    I have downloaded portable vesion of tool https://support.unity.com/hc/en-us/articles/115000513426
    Contents inside - https://prnt.sc/1qz45d6

    I added next line to file at <engine>\Editor\Data\Tools\mergeresolving.txt

    use "D:/Chrome Downloads/DiffMerge/sgdm.exe" --nosplash -m -t1="Incoming Changes" -t2="Base" -t3="Working Copy" -r="%d" "%l" "%b" "%r"

    But "Edit-Preferences-External Tools-Revision Control Diff/Merge" dropdown is empty, what should I do?
     
  2. deynekos1488

    deynekos1488

    Joined:
    Mar 20, 2019
    Posts:
    14
    So I decided to read mergeresolving.txt in depth and moved tool to
    C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe

    After that a new entry in dropdown appeared as selected. When I am trying to see differences there is an error - https://prnt.sc/1qz5j5t

    In console:
    Code (CSharp):
    1.  
    2. [Collab] ClearFileContents failed:
    3. D:/dev/Unity Projects/Ducky/Library/Collab/Base
    4. UnityEditor.Web.JSProxyMgr:DoTasks ()
    5.