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