Search Unity

  1. Calling all beginners! Join the FPS Beginners Mods Challenge until December 13.
    Dismiss Notice
  2. It's Cyber Week at the Asset Store!
    Dismiss Notice

Conflict in UnityConnectSettings file

Discussion in 'Unity Collaborate' started by Sievlar, Mar 15, 2018.

  1. Sievlar

    Sievlar

    Joined:
    Oct 3, 2012
    Posts:
    60
    Cross posting from Ads forum:

    The UnityConnectSettings file is causing merge conflicts with Collaborate feature. I develop for UWP & Android on PC and iPhone on a Mac. This particular file has to be different for Android vs iPhone, because of the m_GameId field. Why even have it? You already have the separate ones for Android and iPhone in the same file? I don't want to have to manually merge this file every time.
     
  2. yagodar

    yagodar

    Joined:
    Oct 10, 2016
    Posts:
    6
    Vote for this issue. I have almost same merge conflicts.
    Example: one identical project, two machines - merge conflict in UnityConnectSettings :(