Search Unity

Unity's version control component has been upgraded to Plastic SCM.

Using UnityYAMLMerge with Collaborate

Discussion in 'Unity Collaborate' started by sillyplayground, Nov 30, 2016.

  1. sillyplayground

    sillyplayground

    Joined:
    Aug 27, 2014
    Posts:
    20
    Is there a way to use UnityYAMLMerge with Collaborate? When I click on the diff icon, it launches P4Merge.
    Under Edit > Preference > External Tools, I am only given the options to use P4Merge or Beyond Compare
     
    sillyplayground, Nov 30, 2016
    #1

  2. holliebuckets

    holliebuckets

    Moderator

    Joined:
    Oct 23, 2014
    Posts:
    496
    holliebuckets, Dec 1, 2016
    #2