Search Unity

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

Update Scene...

Discussion in 'Unity Collaborate' started by lordubik, Oct 25, 2016.

  1. lordubik

    lordubik

    Joined:
    Feb 18, 2013
    Posts:
    149
    Is it normal that every times if I or a my collaborate we change a scene, the other person sees the scene with a conflict? :/ and if I try to 'show the different' 1) unity don't open the merge tool 2) unity crashes.

    Thanks!
     
    lordubik, Oct 25, 2016
    #1

  2. holliebuckets

    holliebuckets

    Moderator

    Joined:
    Oct 23, 2014
    Posts:
    496
    hi @lordubik

    You should only see a conflict if you are altering the same thing. There was a known crash around the "See Diff" button but it has been fixed in the latest beta. w̶e̶ ̶c̶a̶n̶ ̶b̶a̶c̶k̶p̶o̶r̶t̶ ̶t̶h̶e̶ ̶f̶i̶x̶

    UPDATE: it has been backported :)
     
    Last edited: Oct 26, 2016
    holliebuckets, Oct 26, 2016
    #2