A programming-language-aware, refactor-ready merge tool • Hacker News Board

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

#17

Post by davvid » Tue, Apr 09, 2013, 11:17 PM UTC

psantosl wrote: post #6

jng wrote: post #4

Can this be easily integrated into SVN, TortoiseSVN, and git?

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! :-)

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

#18

Post by psantosl » Tue, Apr 09, 2013, 11:33 PM UTC

davvid wrote: post #17

psantosl wrote: post #6

Earlier quoted context omitted.

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! :-)

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.

Hi David, sure, I'll try to contact you and I'll send you the config info.