Search Unity

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

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:
    7
    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
     
    ehnree, Jun 17, 2017
    #1

  2. Ryan-Unity

    Ryan-Unity

    Joined:
    Mar 23, 2016
    Posts:
    1,993
    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.
     
    Ryan-Unity, Jun 19, 2017
    #2

  3. ehnree

    ehnree

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

    Thanks! That worked.

    I'm using Unity version 5.6.1f1 Personal edition
     
    ehnree, Jun 19, 2017
    #3
    Ryan-Unity likes this.