The merge tool that understands your code

Add --slient CLI flag to skip GUI for automatically resolved conflicts

Typically when rebasing in git, there will be a ton of trivial merge conflicts where I have to click Save & Exit in the GUI on each and every one.

I believe there was a --slient flag at one point, but I never worked and I can no longer find documentation on it. Running 1.0.80.

--slient together with -a (automatic merge) would ideally do what I want.

My .gitconfig is as follows:

[mergetool "semanticmerge"]
cmd = \"C:/Users/Andreas/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe\" -d \"$LOCAL\" -s \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\" -a --nolangwarn --silent
trustExitCode = true

6 votes
Vote
Sign in
(thinking…)
Sign in with: Facebook Google
Signed in as (Sign out)
You have left! (?) (thinking…)
Andreas Gullberg Larsen shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

1 comment

Sign in
(thinking…)
Sign in with: Facebook Google
Signed in as (Sign out)
Submitting...
  • vsanchezm commented  ·   ·  Flag as inappropriate

    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 :)

Feedback and Knowledge Base