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. We have updated the language to the Editor Terms based on feedback from our employees and community. Learn more.
    Dismiss Notice
  3. Join us on November 16th, 2023, between 1 pm and 9 pm CET for Ask the Experts Online on Discord and on Unity Discussions.
    Dismiss Notice
New Forum User Notice Update to the Unity Editor Software Terms Unite 2023 - Ask the Experts Online

UnityYAMLMerge and TortoiseSVN

Discussion in 'Editor & General Support' started by andyz, Jul 31, 2015.

  1. andyz

    andyz

    Joined:
    Jan 5, 2010
    Posts:
    2,136
    Is anyone successfully using UnityYAMLMerge and TortoiseSVN as it's a nightmare merging scene files with the TortoiseMerge tool as it doesn't 'get' YAML?

    I tried setting it up as per the TortoiseGIT instructions but it threw an error on merging conflicts.
    Does it use YAMLMerge as an automatic step before manual TortoseMerge or it blocks you out of the manual step and tries to automate it?

    I would love to see a visual version of UnityYAMLMerge (like TortoiseMerge).
     
    andyz, Jul 31, 2015
    #1

  2. jdrewsen

    jdrewsen

    Unity Technologies

    Joined:
    Mar 28, 2011
    Posts:
    201
    If setup in TortoiseGIT then TortoiseGIT will first call UnityYAMLMerge which will try to merge the files. If it succeeds with no conflicts the you are done. If there are any conflicts then UnityYAMLMerge will launch your favourite mergetool (fallback tool) as specified in the mergespecfile.txt which is located right next to the UnityYAMLMerge executable. The default content of that file lists the most common merge tools out there.
    Using the fallback tool you can manually handle the remaining conflicts that UnityYAMLMerge could not handle automatically.

    A visual tool would indeed be wonderful and is in the backlog.
     
    jdrewsen, Aug 3, 2015
    #2

  3. andyz

    andyz

    Joined:
    Jan 5, 2010
    Posts:
    2,136
    Ok great - It didn't work with TortoiseSVN when I tried as showed an error about not finding something - has it been tested with TortoiseSVN? - If I get the error again I'll post
     
    andyz, Aug 3, 2015
    #3

  4. jingfengji

    jingfengji

    Joined:
    Dec 26, 2017
    Posts:
    1
    Hello , Can we use that visual tool now?where can we download,please.
     
    jingfengji, Apr 4, 2018
    #4