JustPaste.it

Podešavanje Unity YAML merge

User avatar
lukablaskovic @lukablaskovic · Mar 25, 2023

[merge]
    tool = unityyamlmerge

    [mergetool "unityyamlmerge"]
    cmd = " \"ruta_do_vaseg_yamlmerge-filea\" merge -p \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\" "
    trustExitCode = false

 

 

Primjer:

 

[merge]
    tool = unityyamlmerge

    [mergetool "unityyamlmerge"]
    cmd = " \"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.18f1\\Editor\\Data\\Tools\\UnityYAMLMerge.exe\" merge -p \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\" "
    trustExitCode = false