Search Unity

  1. We've closed the job boards. If you're looking for work, or looking to hire check out Unity Connect. You can see more information here.
    Dismiss Notice
  2. We're running great holiday deals on subscriptions, swag and Asset Store packages! Take a peek at this blog for more information!
    Dismiss Notice
  3. Check out our Unite Austin 2017 YouTube playlist to catch up on what you missed. More videos coming soon.
    Dismiss Notice
  4. Unity 2017.2 is now released.
    Dismiss Notice
  5. The Unity Gear Store is here to help you look great at your next meetup, user group or conference. With all new Unity apparel, stickers and more!
    Dismiss Notice
  6. Introducing the Unity Essentials Packs! Find out more.
    Dismiss Notice
  7. Want to see the most recent patch releases? Take a peek at the patch release page.
    Dismiss Notice
  8. Unity 2017.3 beta is now available for download.
    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:
    5
    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:
    558
    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:
    5
    Hey @ryanc-unity,

    Thanks! That worked.

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