123 results found
-
Add --slient CLI flag to skip GUI for automatically resolved conflicts
Typically when rebasing in git, there will be a ton of trivial merge conflicts where I have to click Save & Exit in the GUI on each and every one.
I believe there was a --slient flag at one point, but I never worked and I can no longer find documentation on it. Running 1.0.80.
--slient together with -a (automatic merge) would ideally do what I want.
My .gitconfig is as follows:
[mergetool "semanticmerge"]
cmd = \"C:/Users/Andreas/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe\" -d \"$LOCAL\" -s \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\" -a --nolangwarn --silent
trustExitCode = true6 votes -
Merge should ignore all references to renamed item.
If a method, field, or property is renamed, the tool understands this and lets you know it was just a rename. However, it still flags every place in the code that references that item as a change. This seems like a simple thing for the tool to recognize and filter these out.
Renames (especially in Visual Studio) are done in an almost guaranteed bug free way. So, I would love to not have to see them in diffs at all.
14 votes -
3 votes
-
Debian packages are signed with an expired key
Currently (for some time now) when running 'update' in aptitude the following error is reported:
A: GPG error: https://www.semanticmerge.com ./ Release: The following signatures are not valid: KEYEXPIRED 1442157655
Of course, this has nothing to do with 'aptitude'.
A new key needs to be provided and packages need to be signed with that key.
The way Debian and Ubuntu do this is to have a separate package which is signed with the old key, and, when needed, delivers the new keys, then, after that package is available, the new key can be used for signing.
3 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 -
text alignment after resolving merge conflicts
Version
semanticmergetool.exe 1.0.77.0
mergetool.exe 5.4.10.77Language
C#
Everything works great for C#
Sometimes, however, semanticmerge makes my code ugly like the screenshot I attached.
It seems it has some problem on tab character merging or my fault.
any idea?2 votes -
Handle project.json files
Provide a nice view of the changes in project.json files that are the new standard for DNX development.
Not looking for generic JSON support, just for the project files (although I wouldn't complain...)
1 vote -
Resolved conflicts shouldn't show on the scroll bar
When a conflict is resolved, it still uses a red color in the scroll bar, meaning there's no easy way to check which ones are solved and which aren't.
4 votes -
During merge, show which block was selected on the scroll bar for quick reviewing
Right now, it's hard to check which block was selected as part of a review: you have to select the block and then look at the bar above each panel. Maybe some symbol could be added to the scrollbar.
6 votes -
Clearly denote which block is being reviewed
Right now, it's a little confusing to check which block is being currently reviewed in the merge tool (or on the diff tool). Only colors might not be enough, or, maybe, changing the color on the scroll bar may be the solution.
6 votes -
8 votes
-
Make showing removed blocks from the Result File optional
If the selected changeset removed something and added something else, the result file panel will show the old line with a strikethrough. That's a bit counter-intuitive, IMO, for I want to see the actual result (which wouldn't include any removed lines).
3 votes -
3 votes
-
Matlab support
I'm doing some heavy duty Matlab refactoring, which is a realm of development that often takes place in realms outside of widely accepted software practices (http://programmers.stackexchange.com/questions/43733/who-organizes-your-matlab-code?rq=1). Having this sort of language aware difference checker would have greatly aided all the cross file, cleanup, rearchitecting refactoring I had to conduct.
1 vote -
Drop Machine Specific Ids
I use a VM and my license keeps getting made invalid and I have to raise a support ticket to get it fixed. This makes it unusable for me
6 votes -
Ctrl+Z undo support whilst doing a manual merge
When doing a manual merge you might be experimenting, so undoing a line change is invaluable.
9 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 -
Nemerle support
Nemerle is a multi-paradigm programming language for .NET platform
1 vote -
C++/CLI
While you're at it with adding C++ support why not go a bit further and support C++/CLI code? We use both regularly and would love to use semanticmerge with all our code.
6 votes -
Add ability to merge changes in a text diff.
When viewing a text diff of the current and previous versions of a file it'd be nice to be able to easily move changes from the previous file back into the current one.
6 votes
- Don't see your idea?