Questions tagged [semantic-diff]

5 questions
51
votes
2 answers

git diff algorithm that does not rip functions apart? (language-aware diff)

Is it possible to configure git diff to respect indentation and syntax? I am not talking about ignoring indentation and spaces, but rather to use blank lines, indentation levels and possibly brackets, to help matching the old lines to new…
donquixote
  • 4,877
  • 3
  • 31
  • 54
49
votes
2 answers

Tool to parse and compare two CSS stylesheets

Does anyone know of a good tool that can parse and compare two CSS stylesheets in order to find which selectors have different styles? I cannot use a standard diff-like tool because the two CSS files have very different layout. I need a tool that…
Grodriguez
  • 21,501
  • 10
  • 63
  • 107
6
votes
4 answers

Comparing and rationalizing CSS - not file or diff based

I'm in the process of taking a couple of separate asp.net applications, and combining them. One problem is rationalizing the CSS between the two app - app1 has two css files, while app2 has about 8 of them. Much of the CSS between the two apps is…
chris
  • 36,094
  • 53
  • 157
  • 237
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

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