125 results found
-
semantic merge for better delta code review
how awesome would it be if you join forces with another tool vendor and create a full integration of your semantic diff (including moving things from one file to another) and a tool that helps during code reviews and tracks findings...
finally one could focus on real changesps: plastic scm is missing on their list of integrations
https://smartbear.com/product/collaborator/overview/4 votes -
Show differences highlighted also on the result file
Currently, during a 3-way merge, the individual differences are marked only on the Remote, Base and Local files.
On the Result file, it is only shown the main change (line deleted or added), the individual changes are not shown. For example, if you rename a word in one line, on the 3 source files you have that work highlighted, however, on the result file, it's not highlighted, which makes it hard to see what the difference was.
This would be very useful when solving merge conflicts, because then we could see the differences clearly with the changes on top of…
3 votes -
Add possibility to compare Remote and Local files during merge
Currently, during a 3-way merge, the shown differences are always between Remote/Base and Local/Base.
It would be great to have the possibility of also showing the differences between Remote/Local.
Why? Sometimes the Remote and Local files are exactly the same and since the differences are marked on them when compared to Base they seem to be very different to each other. We have then to open or copy/paste both Remote and Local files on a file editor and then compare them, to see that they are exactly the same.
This is quite common, because when we use squash in Git…
3 votes -
Ignore name changes
Beyond Compare has a feature that I love: you can tell it which string (typically a variable name) on the left side correspond to which string on the right side. For example, you could tell that a variable "dollar" was renamed to "currency" and SM would change all instances automatically.
Even better if, when a rename is detected, you can "approve" all renames in that particular scope.8 votes -
Support for Perl 5 and 6
Show how smart you are by support Perl. It is said that only Perl can understand Perl...
3 votes -
1 vote
-
improve C parser for comments and report comment changes
please run a simple diff with semanticmerge
It will tell you that the include <...> has been changed, not the comment4 votes -
Separate out C# comment changes from other changes
I think that the comments should be treated as a separate category of changes. That is, we have sections for Added, Removed, Moved, Changed. I would think it useful to have a Changed Comments. This is worthwhile because comment changes are much less important than code changes. If I do a lot of documentation changes, and in the same commit I happened to make a small code change (intentionally or not), I want that code change to stand out. The documentation is not nearly as important as the code itself.
7 votes -
.Net, C#: Make #region/#endregion sections their own entity, rather than treating them as comments
Currently, the #region and #endregion tags are treated as part of the comments for the method that occurs after them. As such, if you organize your code with these #region sections, and then you happen to move a method just below a #region to a different place, and then you have a merge conflict over that method, then the regions get messed up.
13 votes -
Diff control for .Net application.
Maybe many will is interesting to compare files in your application. Is it possible to create a new product in the form of control for the .Net applications?
I apologize if this is a silly suggestion, but the market I have not seen something like that.
Thank you.3 votes -
JetBrains IDE Support (Intellij IDEA, Rider, CLion, WebStorm, AppCode)
I would love to use this with my favorite IDE!
9 votes -
OpenSource/OpenCore
It would be awesome if you created an open core product so that others could contribute to the merge algorithms, port to external IDE's, and add support for additional languages.
6 votes -
Support for merging NuGet packages.config files
NuGet package files are simple XML files, and the merge procedure should be reasonably simple too.
Packages are keyed by ID, so if there's a collision based on the ID, take the package reference with the highest version number.
If the two sources include unique packages, the result should be the union of the two.
3 votes -
Markdown/CommonMark support
README.md files and more are pretty common to store in source control because they generally work better in line-differencing environments than most other formats. However, adding a word to a line and reflowing a paragraph still results in more noise than actual, functional difference between the content with traditional differencing tools. Using the CommonMark AST, differences would be far less noisy.
9 votes -
Update the manual!
on semanticmerge.com is no explanation how to integrate it into visualstudio and/or beyondcompare.
this might be a good tool but without thorough explanation on how to integrate it into my and my colleuges working desktop it's just a useless nothingness.
best would be you get your a$$e$ up and create an automatic installer that fully integrates semanticmerge into common configurations.
i'm working for a global player company, hundreds of devs only in the branch where i work, but they don't buy licenses because of this!
think about it $$$...1 vote -
3 votes
-
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 -
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 -
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 -
Allow me to reset machine license keys and create additional keys
You've stated in a previousl request that you will allow us to request as many additial keys as we need since many of us have mutiple machines. Tha is an OK work around for now, but the request process is too cumbersone. ON top of that, if we reinstall Windows or get a new machine, which my team does often, then we need to request a reset of that key via email. This process needs dramatic improvement. At the very least, we need the ability to reset our own keys via the web interface and as added functionality, just allow…
9 votes
- Don't see your idea?