A programming-language-aware, refactor-ready merge tool
codicesoftware.blogspot.com
A programming-language-aware, refactor-ready merge tool
1–10 of 18 posts
Re: A programming-language-aware, refactor-ready merge tool
#2It 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
#3Will I able to use this with my git/mercurial installation?
Re: A programming-language-aware, refactor-ready merge tool
#4Can this be easily integrated into SVN, TortoiseSVN, and git?
Re: A programming-language-aware, refactor-ready merge tool
#5Will I able to use this with my git/mercurial installation?
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
#6Can 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! :-)
Re: A programming-language-aware, refactor-ready merge tool
#7[deleted]
Re: A programming-language-aware, refactor-ready merge tool
#8Regarding the diagrams: Why Comic Sans?
Re: A programming-language-aware, refactor-ready merge tool
#9Regarding the diagrams: Why Comic Sans?
Our designer was on vacation! :)
Re: A programming-language-aware, refactor-ready merge tool
#10Regarding the diagrams: Why Comic Sans?
Good call, monospace fonts (Consolas, Lucida Console) should have been better.