semanticmerge

semanticmerge

Categories

JUMP TO ANOTHER FORUM

  1. C# is nice, but JavaScript rules the front-end :)

    878 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    19 comments  ·  Flag idea as inappropriate…  ·  Admin →
  2. You should now that merging a xml file (or a visual studio resource file) is a pain :(

    686 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    10 comments  ·  Flag idea as inappropriate…  ·  Admin →
  3. 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 →
  4. 319 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. I really want this merge tool to work inside of Visual Studio 2012. I live in Visual Studio all day long...and if merging can become better via calls to the TFS Build process for gated check-ins, I'd use this tool in a heart beat and sign it's high praises to every developer i meet.

    243 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 →
  6. It would be great to have XAML support.

    There's a few common formatting changes that can be made to XAML documents without affecting the semantics but that do affect traditional merge tools quite badly. It would be great not to have to deal with those by hand.

    The most common changes are probably reordering element attributes, and moving attributes onto separate lines vs. having > 1 attribute on the same line.

    There is then the equivalent issue to what you have been talking about already: re-ordering and re-arranging elements in the file. Note that XAML has an extra way of…

    243 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 →
  7. Add support for Ruby!

    181 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 →
  8. I am pretty excited about this tool but need Scala support to be able to use it in my daily work.

    170 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 →
  9. Support Objective-C for all us iOS and OS X devs.

    143 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. 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 →
  11. 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 →
  12. TypeScript is a superset of JavaScript, popular among .NET developers and is typed. Support would be very handy

    120 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 →
  13. 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 →
  14. For strongly typed languages like Haskell (and probably for some others too) it would make sense to have the ability to check the merge result with the compiler or some other external tool and to fall back on a manual merge if it does not compile.

    99 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. 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 →
  16. 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 →
  17. They are both hierarchal text data formats but are hard to compare with the current tools around strange enough .

    66 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 →
  18. 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 →
  19. 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 →
  20. 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 →
← Previous 1 3 4 5 6
  • Don't see your idea?