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. We have updated the language to the Editor Terms based on feedback from our employees and community. Learn more.
    Dismiss Notice
New Forum User Notice Update to the Unity Editor Software Terms
Unity's version control component has been upgraded to Plastic SCM.

Disable Scene Smart Merge

Discussion in 'Unity Collaborate' started by AcidArrow, Mar 6, 2020.

  1. AcidArrow

    AcidArrow

    Joined:
    May 20, 2010
    Posts:
    11,064
    Is there a way to disable scene smart merge (or specifically exclude certain things from it?).

    We have a serialized array that if more than one people even look at it, Collaborate eventually F***s it up.
     
    AcidArrow, Mar 6, 2020
    #1

  2. christophera_unity

    christophera_unity

    Unity Technologies

    Joined:
    Aug 16, 2018
    Posts:
    17
    As far as I know, there's no way to disable smart-merge. This sounds more like a bug in the smart-merge tool itself (yamlmerge).
     
    christophera_unity, Mar 6, 2020
    #2