Search Unity

  1. Welcome to the Unity Forums! Please take the time to read our Code of Conduct to familiarize yourself with the forum rules and how to post constructively.
  2. Unite 2023 Registrations are now LIVE! We are thrilled to announce that Unite 2023 Registration is now live and open for all!
    Dismiss Notice
New Forum User Notice Unite 2023 Registrations are now LIVE!
Unity's version control component has been upgraded to Plastic SCM.

[Solved] Solving merge manually ?

Discussion in 'Unity Collaborate' started by dworm, Jul 4, 2017.

Thread Status:
Not open for further replies.

  1. dworm

    dworm

    Joined:
    Jun 17, 2015
    Posts:
    74
    Is there a way to manually solve all the merges without using the collab tool, or just skip it entirely and assume everything stored locally has already passed the merge check and is therefore the actual choice ?

    Thank you
     
    dworm, Jul 4, 2017
    #1

  2. Kyuugatsu

    Kyuugatsu

    Unity Technologies

    Joined:
    Jan 11, 2014
    Posts:
    32
    Kyuugatsu, Jul 5, 2017
    #2
Thread Status:
Not open for further replies.