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. Voting for the Unity Awards are OPEN! We’re looking to celebrate creators across games, industry, film, and many more categories. Cast your vote now for all categories
    Dismiss Notice
  3. 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 The 15th Unity Awards Unite 2023 Registrations are now LIVE!

Is anyone using Unity3D projects with VSTS?

Discussion in 'General Discussion' started by ThunderSoul, Sep 19, 2018.

  1. ThunderSoul

    ThunderSoul

    Joined:
    Sep 28, 2016
    Posts:
    63
    I've been using Unity3D with VSTS ever since I started with Unity (because I'm used to TFS).

    Has anyone managed to automatically merge a .unity scene file? I always have to do it manually because I always get conflicts during merge, and that can be prone to mistakes (which I am already guilty of).

    Thanks!
     
    ThunderSoul, Sep 19, 2018
    #1

  2. AndersMalmgren

    AndersMalmgren

    Joined:
    Aug 31, 2014
    Posts:
    5,358
    We use VSTS with Git. Only simple merge problems are fixable. Otherwise its too great risk of errors. You should use prefabs as much as possible.
     
    AndersMalmgren, Sep 19, 2018
    #2
    TonyLi likes this.

  3. ThunderSoul

    ThunderSoul

    Joined:
    Sep 28, 2016
    Posts:
    63
    Hey, thanks for the reply. I don't use VSTS with Git. Prefabs or not is not the issue. It's the scene. Any idea how to manage that?
     
    ThunderSoul, Sep 19, 2018
    #3

  4. AndersMalmgren

    AndersMalmgren

    Joined:
    Aug 31, 2014
    Posts:
    5,358
    No, you can only minimize the problem using prefabs. Then you change the prefabs instead of the scene.
     
    AndersMalmgren, Sep 19, 2018
    #4

  5. ThunderSoul

    ThunderSoul

    Joined:
    Sep 28, 2016
    Posts:
    63
    Ah I understand... Thank you for your help. :)
     
    ThunderSoul, Sep 19, 2018
    #5