Skip to content

Settings and activity

1 result found

  1. 6 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    How important is this to you?

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    An error occurred while saving the comment
    vsanchezm commented  · 

    Hi Andreas,

    In order to read about these flags or any other available flag run: semanticmergetool.exe --help.

    -a | --automatic: Automatically merge without user interaction unless conflicts are found

    --silent: This option must be used combined with the --automatic option.
    When a merge can't be solved automatically, this option causes that the tool returns immediately
    (no semanticmerge tool is shown), and the program returns an exit code different than zero.
    If the tool was able to solve the merge automatically, the program returns the exit code 0.

    Let me know if you need further help :)