semanticmerge

The merge tool that understands your code

You've used all your votes and won't be able to post a new idea, but you can still search and comment on existing ideas.

There are two ways to get more votes:

  • When an admin closes an idea you've voted on, you'll get your votes back from that idea.
  • You can remove your votes from an open idea you support.
  • To see ideas you have already voted on, select the "My feedback" filter and select "My open ideas".
(thinking…)

Enter your idea and we'll search to see if someone has already suggested it.

If a similar idea already exists, you can support and comment on it.

If it doesn't exist, you can post your idea so others can support it.

Enter your idea and we'll search to see if someone has already suggested it.

  1. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  2. Open multiple diffs as tabs

    When I go to diff several changes from a single changelist in perforce, I can launch a diff on the whole changelist.

    Currently this shows up as several windows, which is a little unwieldy to switch between easily - can semanticmerge be set to have a tabbed interface for multiple diffs / merges, much like beyond compare currently does?

    8 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  3. 8 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  4. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  5. 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 = true

    6 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  6. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  7. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  8. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  9. Kotlin, please!

    Many Android developers are now switching from Java to Kotlin. It could be pretty well to have Kotlin support in SemanticMerge.

    6 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  10. Oracle Package Procedures

    Since Oracle SP/Function code is maintained in Packages, a tool like Semantic Merge would be excellent. Methods in packages can be refactored (cross-file would be great), use function overloading, etc. This is all in database code we maintain in SQL files, so a more powerful merge utility, like Semantic Merge would be invaluable.

    6 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  11. JetBrains IDE Support (Intellij IDEA, Rider, CLion, WebStorm, AppCode)

    I would love to use this with my favorite IDE!

    6 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  12. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  13. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  14. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  15. Add another order of semantic differences

    Currently semantic differences are grouped by type (added, changed, deleted), but sometimes it's not preferred way to see changes. Sometimes preferred way to see changes is in order they are located in file.

    6 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  16. Autodetecting of encoding.

    For example Cp-1251 (Cyrrilic, Windows-1251) wasn't autodetected

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

    4 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    2 comments  ·  Flag idea as inappropriate…  ·  Admin →
  18. OCaml support

    supporting the Ocaml functional language would be great

    4 votes
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  19. 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
    Vote
    Sign in
    (thinking…)
    Sign in with: Facebook Google
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  20. Add more keyboard shortcuts for previous / next diff

    Most compare tools support F7 / F8 to navigate through diffs (P4Merge, Araxis)

    You should consider adding at least F7 / F8 rather adding complex keyboard configuration in the tool.

    Araxis also support by default:
    - Ctrl + Page Up, Alt + Left
    - Ctrl + Page Down, Alt + Right

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

semanticmerge

Feedback and Knowledge Base