semanticmerge

semanticmerge

Categories

JUMP TO ANOTHER FORUM

  1. 1 vote
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  2. Sometimes, the diff panels on each file in semanticdiff are too narrow, even when hiding the Semantic Outline. Allowing horizontal scrolling with Shift + Mouse wheel would help reviewing long lines of code. A word wrap option would also do the job, although having both would be the best.

    1 vote
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  3. Semantic Merge allows for external parsers but currently it only allows for one, making the adoption of using them very limited, when you are using more than one non-supported language. I would like it if Semantic Merge could support configuring external parsers by extensions they handle.

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  4. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  5. Rust is a young but promising language. Having semantic merge would be awesome.

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  6. please run a simple diff with semanticmerge
    It will tell you that the include <...> has been changed, not the comment

    4 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    2 comments  ·  Flag idea as inappropriate…  ·  Admin →
  7. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  8. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  9. Show how smart you are by support Perl. It is said that only Perl can understand Perl...

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  10. 1 vote
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  11. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  12. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  13. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  14. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  15. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  16. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  17. 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 = true

    6 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  18. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  19. 3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  20. 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
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  • Don't see your idea?