Search Unity

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

Merge conflicts after update to 2019.3.8f1

Discussion in 'Unity Collaborate' started by MLvdh, Apr 21, 2020.

  1. MLvdh

    MLvdh

    Joined:
    Mar 21, 2020
    Posts:
    2
    Hi,

    I'm having some problems with a project in Unity Collaborate. It happened after we decided to update the editor to version 2019.3.8f1.

    After this update it suddenly said there were merge conflicts.



    I already checked the manifest.json file and compared it with someone else I'm working with. We saw I was missing some dependencies, but we failed to figure out why.

    (we're working with an Oculus Quest, maybe you should know that + I am the only one that has the Oculus and the only one having this problem..)

    Thanks in advance!
     
    MLvdh, Apr 21, 2020
    #1

  2. MLvdh

    MLvdh

    Joined:
    Mar 21, 2020
    Posts:
    2
    [SOLVED]
     
    MLvdh, Apr 21, 2020
    #2

  3. Fabeuro

    Fabeuro

    Joined:
    Apr 17, 2020
    Posts:
    3
    How, you can't just say solved and not say how, that defeats the point
     
    Fabeuro, Feb 10, 2021
    #3

  4. Nzredwolf

    Nzredwolf

    Joined:
    Dec 27, 2021
    Posts:
    1
    can you at least tell us HOW you solved it?
     
    Nzredwolf, Jan 8, 2022
    #4