Search Unity

  1. Megacity Metro Demo now available. Download now.
    Dismiss Notice
  2. Unity support for visionOS is now available. Learn more in our blog post.
    Dismiss Notice
Unity's version control component has been upgraded to Plastic SCM.

Merge Conflicts

Discussion in 'Unity Collaborate' started by JohnRossitter, Mar 10, 2017.

  1. JohnRossitter

    JohnRossitter

    Joined:
    Dec 18, 2013
    Posts:
    1,027
    Nope, none here...
    My Collab window will stay like this for ever until I restart Unity.
     

    Attached Files:

  2. Ryan-Unity

    Ryan-Unity

    Joined:
    Mar 23, 2016
    Posts:
    1,993
    That bug is a crappy one. We have a fix in 5.6.
     
    JohnRossitter likes this.
  3. JohnRossitter

    JohnRossitter

    Joined:
    Dec 18, 2013
    Posts:
    1,027
    Awesome!
     
    Ryan-Unity likes this.
  4. Ryan-Unity

    Ryan-Unity

    Joined:
    Mar 23, 2016
    Posts:
    1,993
    Until the fix gets in, you can restart Unity and your Collab Toolbar should show your list of merges again.
     
  5. MrLucid72

    MrLucid72

    Joined:
    Jan 12, 2016
    Posts:
    962


    Ha me too - I just reported a bug within Unity.

    Epic!
     
  6. Bubsavvy

    Bubsavvy

    Joined:
    Sep 18, 2017
    Posts:
    48
    Our team is on the edge of giving up. We are so depressed. :C We have a demo next week and may have to cancel it if this keeps up. :C There is no hope... All hope is lost...
     

    Attached Files:

    Last edited: Mar 10, 2019
  7. Ryan-Unity

    Ryan-Unity

    Joined:
    Mar 23, 2016
    Posts:
    1,993
    We're here to help, @Bubsavvy. If you're having trouble sending your crash stack through the Bug Reporter then please open a Support Ticket by going to the Developer Dashboard website for your project, then under the Collaborate section click on Support to Submit a Ticket. Our Support Team will get back to you right away and help get you sorted out.