Search Issue Tracker

Fixed in 2020.2

Fixed in 2020.1

Votes

1

Found in

2020.1.0a23

Issue ID

1224872

Regression

Yes

Apple File Merge not supported by Collaborate as diff tool

Collab

-

How to Repro:
1. Open a Collab-enabled Project in Unity 2020.1+.
2. Open the Preferences menu, go to External Tools and make sure that Apple File Merge is selected as the Revision Control Diff/Merge Tool.
3. Create small change in SampleScene.unity and save.
4. Open the Collab Window by pressing the Collab button.
5. On the modified SampleScene asset, hover over it and choose to See Differences.

Expected: Apple File Merge should open and highlight the changes made in SampleScene.unity.
Actual: Apple File Merge doesn't open, in the Collab Window there is a red error that says "Sorry, something went wrong, please try again later."

Comments (3)

  1. 67c1aff770f2bf959c9df54ae63df4bf?d=mm

    chachi

    Jul 07, 2020 21:38

    EDIT: documentation for setting up a custom Diff tool is ready here: https://docs.unity3d.com/2020.2/Documentation/Manual/Preferences.html

  2. 67c1aff770f2bf959c9df54ae63df4bf?d=mm

    chachi

    Jul 07, 2020 21:27

    Same here. I tried setting up VSCode as my diff tool but failed to find the needed params.

  3. 3a4bfe3dfeccd588556a226edebc0fac?d=mm

    Purple-Toupee

    Mar 23, 2020 07:45

    Additionally, I can't use a 3rd party tool because there is no documentation on how to set up the command line args. I can't tell what tokens to use to represent the file names, and leaving the command line arguments blank passes nothing.

Add comment

Log in to post comment

All about bugs

View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.