tag:blogger.com,1999:blog-27232680.post2835287118020207839..comments2024-03-20T06:54:32.435+01:00Comments on Plastic SCM blog: Xmerge to merge refactored codeF3RD3Fhttp://www.blogger.com/profile/11524626976811746062noreply@blogger.comBlogger3125tag:blogger.com,1999:blog-27232680.post-78268724961363765862010-07-29T19:19:19.361+02:002010-07-29T19:19:19.361+02:001) Hope you've patented this technique (not r...1) Hope you've patented this technique (not really, since I'm opposed to software patents) and/or are not infringing on someone else (why is no one else doing this already?)<br /><br />2) More encouragement to give away free separate from your SCM server for brand recognition / to sell separately.Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-27232680.post-66225732030550800662010-07-28T09:57:52.323+02:002010-07-28T09:57:52.323+02:00Hi Adam,
No, it's not the same.
Git is able ...Hi Adam,<br /><br />No, it's not the same.<br /><br />Git is able to tell you, with git blame (the long scan) which code has been moved between files on the same commit. And it needs the code to match exactly, it won't track modified code after the move.<br /><br />Xmerge is all about merging, nothing to do with content tracking.<br /><br />And, Xmerge is able to locate code (as I showed on the video) that has been not only moved but also modified, out of the scope of Git.Pablo Santoshttps://www.blogger.com/profile/08083682682597484025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-58301274604008347032010-07-28T09:07:10.489+02:002010-07-28T09:07:10.489+02:00Doesn't git do this by tracking content?Doesn't git do this by tracking content?Adamhttps://www.blogger.com/profile/00624806802039000519noreply@blogger.com