News for hackers. Stuff that matters.
Re:A programming-language-aware, refactor-ready merge tool by psantosl on Tuesday April 09, 2013 @03:01PM (#5520341)
It is able to identify methods that have been moved and modified, totally reorganized classes, find conflicts at the semantic level and may more... hope it helps!
Re:A programming-language-aware, refactor-ready merge tool by noppoo on Tuesday April 09, 2013 @03:32PM (#5520588)
Regarding the diagrams: Why Comic Sans?
Re:A programming-language-aware, refactor-ready merge tool by rlbisbe on Tuesday April 09, 2013 @03:36PM (#5520617)
Good call, monospace fonts (Consolas, Lucida Console) should have been better.
Re:A programming-language-aware, refactor-ready merge tool by psantosl on Tuesday April 09, 2013 @03:36PM (#5520614)
Our designer was on vacation! :)
Re:A programming-language-aware, refactor-ready merge tool by jng on Tuesday April 09, 2013 @03:05PM (#5520379)
Can this be easily integrated into SVN, TortoiseSVN, and git?
Re:A programming-language-aware, refactor-ready merge tool by psantosl on Tuesday April 09, 2013 @03:08PM (#5520397)
Yep! It is a client app so really easy. Once we go live (in a few days), we'll post the info about how to get it configured with every scm! :-)
Re:A programming-language-aware, refactor-ready merge tool by davvid on Tuesday April 09, 2013 @07:17PM (#5522118)
Can you please send a git-mergetool patch to the git mailing list? This will save everyone the trouble of needing to discover how to configure it. Feel free to contact me offline if you need some pointers.
Re:A programming-language-aware, refactor-ready merge tool by psantosl on Tuesday April 09, 2013 @07:33PM (#5522201)
Hi David, sure, I'll try to contact you and I'll send you the config info.
Re:A programming-language-aware, refactor-ready merge tool by rlbisbe on Tuesday April 09, 2013 @03:03PM (#5520361)
Will I able to use this with my git/mercurial installation?
Re:A programming-language-aware, refactor-ready merge tool by psantosl on Tuesday April 09, 2013 @03:06PM (#5520387)
Yep, it can be setup to be used with ANY version control. We already tested it with Git, Hg, SVN, TFS... and it will be usable from P4 and others
Re:A programming-language-aware, refactor-ready merge tool by Leszek on Tuesday April 09, 2013 @06:51PM (#5521986)
What languages are supported? The examples look like C#?
Re:A programming-language-aware, refactor-ready merge tool by psantosl on Tuesday April 09, 2013 @07:09PM (#5522084)
yep. we started with c#. java will be there too, later c/c++ and after all that it is a matter of listening to our users and react as fast as we can! :-) I'd love to have javascript soon too.
Re:A programming-language-aware, refactor-ready merge tool by mgsm on Tuesday April 09, 2013 @05:12PM (#5521418)
I'm really impressed, great work!
Re:A programming-language-aware, refactor-ready merge tool by rubarax on Tuesday April 09, 2013 @04:09PM (#5520949)
I have to see it to believe it!
Re:A programming-language-aware, refactor-ready merge tool by mrcatacroquer on Tuesday April 09, 2013 @03:41PM (#5520680)
Cool work! I'll give it a try.