Search Unity

How to merge *.unity when you work in a team?

Discussion in 'Editor & General Support' started by xxShana, Sep 2, 2019.

  1. xxShana

    xxShana

    Joined:
    Jul 4, 2019
    Posts:
    23
    Hello everybody!
    We are using bitbucket and common git(NOT CALLABORATE).
    We have some problems when merging *.scene files. If nobody change nothing at scene(but in editor scene are always changes - star at edits - ALWAYS), scene are always changed. And when i safe it, always have CONFLICTS mergin.
    How to correct use mergin this files?
     
    xxShana, Sep 2, 2019
    #1

  2. fffMalzbier

    fffMalzbier

    Joined:
    Jun 14, 2011
    Posts:
    3,276
    Unity Includes a tool for merging scenes and prefabs.
    Its called Smart Merge.
    https://docs.unity3d.com/Manual/SmartMerge.html
    There is a section in the documentation that shows how it can be used with git.

    About the "its always changed", there may be some script that runs in edit mode that updates something without you knowing.
     
    Last edited: Sep 2, 2019
    fffMalzbier, Sep 2, 2019
    #2

  3. Havokki

    Havokki

    Joined:
    Jun 28, 2015
    Posts:
    118
    Some UI components that automatically handle layouts keep marking the scene as dirty. Not sure if there is any workaround for this.
     
    Havokki, Sep 2, 2019
    #3

  4. xxShana

    xxShana

    Joined:
    Jul 4, 2019
    Posts:
    23
    Thx a lot!
     
    xxShana, Sep 4, 2019
    #4