Search Unity

  1. Unity Asset Manager is now available in public beta. Try it out now and join the conversation here in the forums.
    Dismiss Notice

How to avoid merge conflicts on MainScene.scene?

Discussion in 'Project Tiny' started by mivey_unity, Jul 10, 2019.

  1. mivey_unity

    mivey_unity

    Joined:
    Jun 18, 2019
    Posts:
    4
    We're using git to version a Tiny project, and we frequently get merge conflicts on MainScene.scene. It seems like any time two people add components to an entity or add entities, there's a conflict.

    Correctly resolving the conflicts is tricky for engineers, and impossible for our artists & designers.

    Is there any way to avoid this? Do other teams have any suggestions for how to collaborate?
     
    mivey_unity, Jul 10, 2019
    #1