Stack Overflow
Stack Overflow

Questions tagged [semantic-merge]

SemanticMerge is a language-aware source code merge and diff tool.

The Semantic Merge tool is a source code diff and merge based on language parsing, designed to deal with code that has been moved and modified.

What is does

As programmers we always expected merge to be this way: first parse the code, then get the structure and finally merge based on that.

Features

Documentation

http://www.semanticmerge.com/index.html#documentation

Contact

9 questions
4
votes
1 answer

Your license is not valid in diff tool

I've recently been trying out the Semantic Merge beta from Codice Software, suddenly when I try to use the diff tool (either within Visual Studio or manually from the desktop) I get the following error: Your license is not valid, you are not able…
CodingGorilla
  • 19,612
  • 4
  • 45
  • 65
3
votes
1 answer

Is there a way to force git merge to always use an external merge tool?

Is there a way to configure git merge in such a way that conflict resolution always goes through an external merge tool? I'm writing the configuration for semanticmerge and there are cases like this that are incorrectly handled by git but can be…
pablo
  • 6,392
  • 4
  • 42
  • 62
3
votes
1 answer

Git mergetool on Windows keeps being given filepath from Git install rather than repository root

I want to use SemanticMerge as my mergetool in Git, but when I try to perform a merge, I get a complaint from SemanticMerge saying that it cannot locate the file C:\Program Files (x86)\Git\my_repo_name\my_project\MyFile.cs.BASE.1234.cs - which is…
glenatron
  • 11,018
  • 13
  • 64
  • 112
3
votes
2 answers

Using Semantic merge as diff tool in Perforce

I'm trying to set up SemanticMerge as my diff tool for C# in Perforce. I've configured perforce with the exe and with the arguments -s=%1 -d=%2 -l=csharp But when I try to diff a C# file I receive the error: Could not find file c:\Program Files…
Paul D'Ambra
  • 7,629
  • 3
  • 51
  • 96
3
votes
1 answer

Moving first item with nested regions using Semantic Merge

In the rearrange file tool moving an item that is the first item within a region also moves the #region line. These moves are generally intended to rearrange items within the region. There also seems to be odd things happening intermittently when…
cidico
  • 386
  • 1
  • 10
2
votes
1 answer

How do I get SemanticMerge to recognize C++?

According to the documentation Semanticmerge supports C++ natively. But when I run it on a set of files (from TortoiseHg), despite the fact that they have a .cpp extension, it thinks they are C#. This of course messes up the language parsing and…
Jon Hodgson
  • 129
  • 10
2
votes
1 answer

How do I stop SemanticMerge from displaying an unsupported language warning when diffing?

How can I configure SemanticMerge to not display a warning dialog when diffing files in a not supported language? By default, when asked to diff files in a language it doesn't understand, it'll display a dialog as pictured below: I'd like to…
aknuds1
  • 65,625
  • 67
  • 195
  • 317
1
vote
1 answer

How do I configure SemanticMerge as the merge tool in Visual Studio 2017

Is there any way to configure SemanticMerge for use with Visual Studio 2017? I've checked the SemanticMerge documentation and they only describe configuration with Visual Studio Code?
Matthew Dresser
  • 11,273
  • 11
  • 76
  • 120
1
vote
1 answer

Configuring text merges with SemanticMerge to use P4Merge in Mercurial

I have followed the instructions at http://www.semanticmerge.com/sm-guides/main.shtml#HowtoconfigurewithMercurial but they are configured for kdiff3 and I would like to use p4merge to do my textual merging. My current mercurial.ini looks like…
jpmcclung
  • 109
  • 2
  • 9