120 results found
-
Swift
Support Swift for all us iOS and OS X devs.
43 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
-
Option to "Show Whitespace" characters
I'd like to be able to show white space characters in the text merge tool.
40 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 -
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 -
Coffeescript support please
Been using coffeescript for back end and front end work and would be good to support that as well. Could probably use the python or ruby modules as a base (once they have been implemented) or better yet, do use coffeescript as a base for ruby and python :)
36 votes -
Merge Visual studio solution files
Be able to merge visual studio solution files (.sln).
36 votes -
PowerShell support
PowerShell function definitions are not order-dependant, other than requiring definition before use. Outside of functions, order is significant.
35 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 -
CLI/text-based merge support
I spend the majority of may day at the command line. It would be nice if this tool could be used from within a terminal.
30 votes -
Clojure support
It would be great to have Clojure support
30 votes -
28 votes
-
support for java property files and other simple configuration syntaxes.
it would be nice to support some micro-languages like java property files
which sometime create merge silly merge conflicts with traditional tools.24 votes -
Go support
Go is a very small and simple language with easy rules for packages and visibility. Growing rapidly in popularity as well should make it a good target for semantic merge.
23 votes -
#if confuse the block toool
If a #if block exists before a modified function, the code within the #if is also grabbed when you view a diff. It is only grabbed on the destination file.
21 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 -
20 votes
-
Git merge driver
Why not implementing Git merge drivers for real git integration?
19 votes -
Support git mergetool/difftool with --dir-diff option - multiple files at once
SemanticMerge opens up files one at a time when I issue git difftool/mergetool commands. This is a pain since with several files when the context is important and moving back and forth between files is often necessary. Git's option --dir-diff was designed to address this - but it doesn't work with SemanticMerge. Beyond Compare supports this and as such I find myself using it more, much as I prefer the SemanticMerge UI.
19 votes -
Configurable Network / Proxy Settings
For updates and licensing connectivity, having configurable network settings would be handy if you're in a corporate network that uses a proxy server.
18 votes -
SCM System Integration
It would nice to be able to see:
- Branch names of files
- Log message
- Blame when requested
- Log of both versions when requested
- Self installation of Merge tool into Git
I believe Git support is crucial, followed by others.
18 votes
- Don't see your idea?