Search Unity

Question Source VS Destination in Evil Twin Conflict?

Discussion in 'Unity Version Control' started by joeysipos, Nov 19, 2022.

  1. joeysipos

    joeysipos

    Joined:
    Jul 28, 2015
    Posts:
    41
    Well this terminology is just confusing...
    What are the local files? "Source" or "Destination" ?

    upload_2022-11-19_16-21-38.png
     
    joeysipos, Nov 19, 2022
    #1

  2. carlosalba1985

    carlosalba1985

    Unity Technologies

    Joined:
    Jul 19, 2021
    Posts:
    1,064
    Hi,

    The destination is "yours" and the source is "theirs" when resolving the conflict.

    In your case, it seems the same path was added already by a worker so you will need to choose what to keep.

    Regards,
    Carlos.
     
    carlosalba1985, Nov 29, 2022
    #2