Search Unity

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

Error Receiving Changes from Coworker

Discussion in 'Unity Collaborate' started by Kajamaz, Feb 25, 2017.

  1. Kajamaz

    Kajamaz

    Joined:
    May 28, 2016
    Posts:
    85
    My coworker uploaded DK UMA 2 and Darkrift to the project, made a few minor changer, and uplaoded. I tried updating and I get the Message, AML merge tool has stopped working, close program or debug. It always crashes. I need help!
     
    Kajamaz, Feb 25, 2017
    #1

  2. Ryan-Unity

    Ryan-Unity

    Joined:
    Mar 23, 2016
    Posts:
    1,993
    Hi @Kajamaz, sorry that you're running into issues. I'm not familiar with the AML merge tool. Are you using that for your diff/merge tool? Could you try using SourceGear DiffMerge or P4Merge for your merge tool?
     
    Ryan-Unity, Feb 27, 2017
    #2

  3. Kajamaz

    Kajamaz

    Joined:
    May 28, 2016
    Posts:
    85
    We aren't using anything other than the default unity collab and have visual studio installed. Otherwise its vanilla Unity installed and we just press the button to upload or download the collab files. Nothing else.
     
    Kajamaz, Feb 28, 2017
    #3

  4. Ryan-Unity

    Ryan-Unity

    Joined:
    Mar 23, 2016
    Posts:
    1,993
    Sorry for the delay. The Amazon S3 outage yesterday kept me from downloading those assets from the store to try to repro your case. Could you share a screenshot of the error message that you're seeing? Also, which version of Unity are you using?
     
    Ryan-Unity, Mar 1, 2017
    #4