Skip to content
← semanticmerge

The merge tool that understands your code

semanticmerge

Categories

JUMP TO ANOTHER FORUM

(thinking…)

fall back on text-based merge if syntax is not recognised

you may already do this - but the tool should perform a text based merge if it cannot do a smart merge for a given file.

7 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…)
wjp shared this idea  ·   ·  Report…  ·  Admin →

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
  • Violeta commented  ·   ·  Report

    Ok! Done! When the semantic merge tool is launched with an unsupported file language, the tool notifies it and allows you to launch the standard merge tool. This new behavior was incorporated into the public beta launched! Check it at: http://www.semanticmerge.com/

  • Dan du Preez commented  ·   ·  Report

    This doesn't seem to be exactly what you do. I run semantic merge from git (via git mergetool) with diffmerge specified as my "fallback" tool.

    When I try and merge a conflicted .csproj file I just get a messagebox which says "Unsupported Extension" and then just exits - I never get redirected to DiffMerge. I've tested diffmerge by clicking the button in SemanticMerge and that works fine.

  • psantosl commented  ·   ·  Report

    Yep! That's exactly what we do! In fact, there's a big button on the left (down) saying "run merge tool" which actually runs the conventional text-based merge tool just in case you do not like what you see :-)