126 results found
-
Ignore Whitespace should also ignore whitespace inside of lines as well
"if (foo)" is semantically the same as "if ( foo )" but the diff counts those as changes when ignore whitespace is on.
13 votes -
Merge Visual studio solution files
Be able to merge visual studio solution files (.sln).
36 votes -
TypeScript support
TypeScript is a superset of JavaScript, popular among .NET developers and is typed. Support would be very handy
123 votesHi all, just in case you didn’t know, we just published a guide explaining how to write parsers for Semantic. Now it is possible to add any language you want :-)
https://users.semanticmerge.com/documentation/external-parsers/external-parsers-guide.shtml
-
Autodetecting of encoding.
For example Cp-1251 (Cyrrilic, Windows-1251) wasn't autodetected
9 votes -
JavaScript, please!
C# is nice, but JavaScript rules the front-end :)
881 votesWe’ve started working on the Java parser!!
-
Add support of merge xml files
You should now that merging a xml file (or a visual studio resource file) is a pain :(
686 votes -
Option to "Show Whitespace" characters
I'd like to be able to show white space characters in the text merge tool.
40 votes -
Show the actual branch names too, not just local remote and base...
After two years of git usage I still get confused sometimes which branch the local, remote refers to, at a given moment. It would be nice to see like remote (branch1), local (branch22).
33 votes -
Merge project files
That'd be nice if you'd help to merge project files (csproj, vbproj) that are generated by the IDE.
437 votes -
322 votes
Hi all, just in case you didn’t know, we just published a guide explaining how to write parsers for Semantic. Now it is possible to add any language you want :-)
https://users.semanticmerge.com/documentation/external-parsers/external-parsers-guide.shtml
-
.cshtml files
Used with ASP.NET MVC projects. They mix C# and HTML.
109 votes -
Dark color theme
Just like the dark color theme in VS2012... Much easier to work with!
132 votesWe’ve started working on a dark theme! We will also allow the user to configure the colors :)
-
Ctrl+S for saving result file changes
When editing the result file, it would be very convenient to be able to save changes using Ctrl+S (Or Cmd+S on mac, when the mac tool is available).
Copy, paste and undo are already working.
39 votes -
HTML files
HTML is a fundamental file type.
51 votes -
CSS / LESS support
Order may sometimes be significant in CSS, but that's pretty rare in practice, I think. (Unlike F# and SQL, where order is very significant, and for which traditional differs may be better for.)
139 votes -
Merging Directories
I want to merge each file in a directory (i.e. for different branches of the same code). I should be able to choose the files that I want to merge with filters (i.e. only source files, not images, etc).
94 votes -
ASPX please!
aspx and aspx.cs are a pretty common combination in the .Net world (even though I'm pushing the company toward MVC)
21 votes -
Use external syntax/type checker/compiler to test if merge result is correct
For strongly typed languages like Haskell (and probably for some others too) it would make sense to have the ability to check the merge result with the compiler or some other external tool and to fall back on a manual merge if it does not compile.
99 votes -
Ignore XML white space errors in C# comments
Merge tool complains about an extra space in c# xml comments. It should just ignore this triviality.
"XML comment has badly formed XML -- 'Whitespace is not allowed at this location'
16 votes -
Customizable keyboard shortcuts
I would like to be able to customize the keyboard shortcuts in the diff tool. Like making Ctrl+Up and Ctrl+Down to move between differences.
40 votes
- Don't see your idea?