120 results found
-
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 -
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
-
Work amazing in Visual Studio 2012
I really want this merge tool to work inside of Visual Studio 2012. I live in Visual Studio all day long...and if merging can become better via calls to the TFS Build process for gated check-ins, I'd use this tool in a heart beat and sign it's high praises to every developer i meet.
243 votes -
XAML support
It would be great to have XAML support.
There's a few common formatting changes that can be made to XAML documents without affecting the semantics but that do affect traditional merge tools quite badly. It would be great not to have to deal with those by hand.
The most common changes are probably reordering element attributes, and moving attributes onto separate lines vs. having > 1 attribute on the same line.
There is then the equivalent issue to what you have been talking about already: re-ordering and re-arranging elements in the file. Note that XAML has an extra way of…
243 votes -
Ruby support
Add support for Ruby!
181 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
-
Scala support
I am pretty excited about this tool but need Scala support to be able to use it in my daily work.
170 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
-
Objective-C
Support Objective-C for all us iOS and OS X devs.
143 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
-
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 -
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 :)
-
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
-
.cshtml files
Used with ASP.NET MVC projects. They mix C# and HTML.
109 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 -
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 -
T-SQL Support
It would be great to have T-SQL Support
78 votes -
In case you going support XML (please see its own vote), add JSON to the list.
They are both hierarchal text data formats but are hard to compare with the current tools around strange enough .
66 votes -
HTML files
HTML is a fundamental file type.
51 votes -
Suggested Commit Messages
You could use this tool to generate a commit message template in a little text box, and optionally copied to the user's clipboard, for example \samples\FileCache\samplesemanticmergetool.bat would generate:
In Codice.Client.GlassFS
Added: Hasher
Moved: HashToHex (from FileCache to Hasher)
Changed: Filecache.GetFile, Hasher.HashToHexDeleted: 3 Using statements
Obviously I would always want my Devs to put in a longer commit about WHY but it would sure make looking at commit histories a little more relaxing.
50 votes -
Xamarin Studio integration
It would be great to have something like this inside of xamarin studio.
44 votes
- Don't see your idea?