Skip to content
← semanticmerge

The merge tool that understands your code

semanticmerge

Categories

JUMP TO ANOTHER FORUM

(thinking…)

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

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
You have left! (?) (thinking…)
Andreas Gullberg Larsen shared this idea  ·   ·  Report…  ·  Admin →
How important is this to you?

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
Submitting...
An error occurred while saving the comment
  • vsanchezm commented  ·   ·  Report

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