5 ms·
A programming-language-aware, refactor-ready merge tool
- psantosl 13y agoIt 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!
- rlbisbe 13y agoWill I able to use this with my git/mercurial installation?
- psantosl 13y agoYep, 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
- jng 13y agoCan this be easily integrated into SVN, TortoiseSVN, and git?
- psantosl 13y agoYep! 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! :-)
- davvid 13y agoCan 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.
- psantosl 13y agoHi David, sure, I'll try to contact you and I'll send you the config info.
- deleted 13y ago[deleted]
- noppoo 13y agoRegarding the diagrams: Why Comic Sans?
- mrcatacroquer 13y agoCool work! I'll give it a try.
- deleted 13y ago[deleted]
- rubarax 13y agoI have to see it to believe it!
- mgsm 13y agoI'm really impressed, great work!
- Leszek 13y agoWhat languages are supported? The examples look like C#?
- psantosl 13y agoyep. 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.