1. Help us improve the editor usability and artist workflows. Join our discussion to provide your feedback.
    Dismiss Notice
  2. We're looking for feedback on Unity Starter Kits! Let us know what you’d like.
    Dismiss Notice
  3. We’re giving 2017.1 beta testers a chance to win t-shirts and a Nintendo Switch. Read more on the blog.
    Dismiss Notice
  4. We want to know how you learned Unity! Help us by taking this quick survey and have a chance at a $25 gift card
    Dismiss Notice
  5. Are you an artist or level designer going to Unite Europe? Join our roundtables there to discuss artist features.
    Dismiss Notice
  6. Unity 5.6 is now released.
    Dismiss Notice
  7. Check out all the fixes for 5.6 on the patch releases page.
    Dismiss Notice

Can't push/update due to ostensibly conflicting files

Discussion in 'Unity Collaborate' started by ehnree, Jun 17, 2017.

  1. ehnree

    ehnree

    Joined:
    Dec 20, 2014
    Posts:
    4
    Hi,

    Collab isn't giving the chance to resolve merge conflicts. Consequently, I get the following window for collab. Any fix for this?

    Thanks
    upload_2017-6-17_15-58-59.png
     
  2. ryanc-unity

    ryanc-unity

    Unity Technologies

    Joined:
    Mar 23, 2016
    Posts:
    332
    Hi @ehnree! I'm sorry you're running into this issue. Which version of Unity are you using?

    To reload your Collab Toolbar, first find your Packages folder:
    (Mac) <username>/Library/Unity/Packages
    (Windows) <username>/AppData/Roaming/Unity/Packages

    Delete this folder then restart the Editor. The Toolbar should display your merge conflicts now.
     
  3. ehnree

    ehnree

    Joined:
    Dec 20, 2014
    Posts:
    4
    Hey @ryanc-unity,

    Thanks! That worked.

    I'm using Unity version 5.6.1f1 Personal edition
     
    ryanc-unity likes this.