semanticmerge

semanticmerge

Categories

JUMP TO ANOTHER FORUM

  1. When editing the result file, it would be very convenient to be able to save changes using Ctrl+S (Or Cmd+S on mac, when the mac tool is available).

    Copy, paste and undo are already working.

    39 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 →
  2. Merge tool complains about an extra space in c# xml comments. It should just ignore this triviality.

    "XML comment has badly formed XML -- 'Whitespace is not allowed at this location'

    16 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 →
  3. aspx and aspx.cs are a pretty common combination in the .Net world (even though I'm pushing the company toward MVC)

    21 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 →
  4. HTML is a fundamental file type.

    51 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 →
  5. Used with ASP.NET MVC projects. They mix C# and HTML.

    109 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. 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

    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 →
  7. I would like to be able to customize the keyboard shortcuts in the diff tool. Like making Ctrl+Up and Ctrl+Down to move between differences.

    40 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    4 comments  ·  Flag idea as inappropriate…  ·  Admin →
  8. It would be great to have T-SQL Support

    78 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 →
  9. 20 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. If a #if block exists before a modified function, the code within the #if is also grabbed when you view a diff. It is only grabbed on the destination file.

    21 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 →
  11. You could use this tool to generate a commit message template in a little text box, and optionally copied to the user's clipboard, for example \samples\FileCache\samplesemanticmergetool.bat would generate:


    In Codice.Client.GlassFS
    Added: Hasher
    Moved: HashToHex (from FileCache to Hasher)
    Changed: Filecache.GetFile, Hasher.HashToHex

    Deleted: 3 Using statements

    Obviously I would always want my Devs to put in a longer commit about WHY but it would sure make looking at commit histories a little more relaxing.

    50 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. 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

    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. It would be great to have something like this inside of xamarin studio.

    44 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. PowerShell function definitions are not order-dependant, other than requiring definition before use. Outside of functions, order is significant.

    35 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. Order may sometimes be significant in CSS, but that's pretty rare in practice, I think. (Unlike F# and SQL, where order is very significant, and for which traditional differs may be better for.)

    139 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. Just like the dark color theme in VS2012... Much easier to work with!

    132 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    7 comments  ·  Flag idea as inappropriate…  ·  Admin →
  17. I want to merge each file in a directory (i.e. for different branches of the same code). I should be able to choose the files that I want to merge with filters (i.e. only source files, not images, etc).

    94 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    5 comments  ·  Flag idea as inappropriate…  ·  Admin →
  18. Trying to do a merge, it was not clear what "source", "destination" and "base" meant. I would change the names from source and destination to something less "judgmental" - kdiff uses A and B --> C. That seems intuitive and saves screen real estate.

    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 →
  19. in the industrial automation, IEC 1131 languages are the standard and there is a text based standardized format for source code. so it would be great for all those companies coding PLC's if they had a version control sytem and merge and diff functionalities that support their IEC languages.
    At the moment there's not really anything like that available on the market.

    10 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. That'd be nice if you'd help to merge project files (csproj, vbproj) that are generated by the IDE.

    437 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

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