Link Details

It is a merge tool that is able to deal with conflicts at the structure level instead of text-based. It first parses the code and then handles the merge based on code structure. It means the refactor operations are now easy to merge... and diff. It is usable with Git, TFS, Plastic SCM, SVN and others. Free beta launched today.

Posted by coderbaby  |   Apr 19 2013 / 08:24

Add your comment


Html tags not supported. Reply is editable for 5 minutes. Use [code lang="java|ruby|sql|css|xml"][/code] to post code snippets.

Recommended Links

Upvoters (5)



Downvoters (0)



    Scala
    Written by: Ryan Knight
    Featured Refcardz: Top Refcardz:
    1. Apache Hadoop
    2. Play
    3. Akka
    4. Debugging JavaScript
    5. Design Patterns
    1. Apache Hadoop
    2. REST
    3. Java
    4. Git
    5. Java Performance
    Connect with DZone