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

Can not run UnityYAMLMerge

Discussion in 'Formats & External Tools' started by duotemplar, Feb 22, 2016.

  1. duotemplar

    duotemplar

    Joined:
    Dec 30, 2010
    Posts:
    26
    I use 5.3.1, and sourceTree for version control.And I set UnityYAMLMerge as what the doc says.But When I Click "Resolve Conflict" in SourceTree, UnityYAMLMerge can not run, and SourceTree start default merge tools still.
    I tried both on Mac and Windows, Why?How can I fixed it?
     
    duotemplar, Feb 22, 2016
    #1

  2. jdrewsen

    jdrewsen

    Unity Technologies

    Joined:
    Mar 28, 2011
    Posts:
    201
    There is an error in the docs. The item:
    • Type the path to UnityYAMLMerge in the Diff Command text field.
    should be corrected to:
    • Type the path to UnityYAMLMerge in the Merge Command text field.
     
    jdrewsen, Feb 23, 2016
    #2

  3. duotemplar

    duotemplar

    Joined:
    Dec 30, 2010
    Posts:
    26
    I try both diff and merge command, and also try only type the path merge command, but still it not start UnityYAMLMerge, start default tool instead
     
    duotemplar, Feb 23, 2016
    #3

  4. jdrewsen

    jdrewsen

    Unity Technologies

    Joined:
    Mar 28, 2011
    Posts:
    201
    UnityYAMLMerge will fix as many conflicts as it can and then fallback to the default merge tool for the remaning conflicts so that you can manually fix them yourself. Are you sure this is not what is happening?
     
    jdrewsen, Feb 24, 2016
    #4