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. When resolving conflicts in TortoiseHg, a file always marked as "Resolved".

    When resolving conflicts in TortoiseHg, Semantic have no option to cancel current changes. It always marks the file as "resolved".
    A only workaround is closing the software and re-marking the file as "Unresolved".

    Kdiff and some other tools treat the file as belows:

    If the user save the file, mark it as "Resolved"
    else (exit without save) leave it in "Unresolved".

    I think this one is quite important, because It may cause "Unintentionally resolved file".

    4 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  2. 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
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  3. 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
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  4. Machine-specific location for storing license keys.

    I usually install my programming tools into a bin directory in my dropbox profile, so that it's replicated across my machines. This is a problem with SM, which tells me my license is corrupt any time I switch boxes.

    3 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  5. Update your Fedora packages for Fedora 20

    The packages here don't work on Fedora 20:

    http://www.semanticmerge.com/linux/#fedora

    I looks like you just need to recompile against a newer version of libtiff.

    3 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  6. 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
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  7. Visual Basic/VBA

    Add support for Visual Basic/VBA

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

    Free pascal support please ;-)

    3 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  9. 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
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  10. New Diff dialog when you've already got the tool open

    Basically, when running the diff tool outside of the IDE if you want to compare another set of diffs, you'll nee to close the semantic merge tool and reopen it.

    Would be great if we could be presented with the "welcome dialog" you see when you open the app for the first time.

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

    Rust is a young but promising language. Having semantic merge would be awesome.

    3 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  12. 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
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  13. Allow external parsers to be configured extension

    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
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  14. Make Visual Diff more interactive

    When comparing files with lots of changes, it would be helpful if the Visual Diff view is more interactive.

    For example when you hover an arrow of some moved code (and there are lots of arrows shown), it would be helpful if that arrow gets highlighted, to easily follow the arrow to spot its target.

    It would also be helpful if you can show and hide the different items (added, changed, removed, renamed items) that you are either interested in or not interested in (as that removes some complexity from the diff).

    3 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  15. 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
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  16. Disable Oops! We do not support your language... yet!

    Would be nice to have the option to disable the dialog as it keeps coming up with known unsupported languages.

    E.G. csproj file in VS (just run the text diff)

    3 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  17. 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
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  18. 3 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  19. ClearCase integration

    Document how to integrate the Semantic Merge into ClearCase

    2 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  20. Encoding: "none"?

    An option available for reading file in a specific encoding is to have it set to "none". What does this mean?

    "None" label is confusing since every data stream needs to be interpreted with an encoding, so it is for sure that an encoding is present at some point.

    If this is a shortcut to a specific encoding detection, then "Automatic" could be a better label for it.

    2 votes
    Vote
    Sign in
    (thinking…)
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  • Don't see your idea?

semanticmerge

Feedback and Knowledge Base