A programming-language-aware, refactor-ready merge tool

http://codicesoftware.blogspot.com/2013/04/put-your-hands-on-programming-language.html

by psantosl • 13 years ago

17 15 13 years ago

codicesoftware.blogspot.com

psantosl6• 13 years ago

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!

rlbisbe2• 13 years ago

Will I able to use this with my git/mercurial installation?

psantosl6• 13 years ago

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

jng• 13 years ago

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

psantosl6• 13 years ago

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

davvid• 13 years ago

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.

noppoo• 13 years ago

Regarding the diagrams: Why Comic Sans?

psantosl6• 13 years ago

Our designer was on vacation! :)

rlbisbe2• 13 years ago

Good call, monospace fonts (Consolas, Lucida Console) should have been better.

mrcatacroquer• 13 years ago

Cool work! I'll give it a try.

rubarax• 13 years ago

I have to see it to believe it!

mgsm• 13 years ago

I'm really impressed, great work!

Leszek• 13 years ago

What languages are supported? The examples look like C#?

psantosl6• 13 years ago

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.

A programming-language-aware, refactor-ready merge tool

Related Stories