Have Geek Brain

Line level merge tool?

Are there any interactive merge tools that, when they get a merge conflict on a given line, go back and try to merge the conflicting lines char -at-a-time?

I am thinking of cases where you get a merge conflict between a modified line of code and the same line as indented.

BTW: I am using Beyond Compare called from TortoiseSVN

+1


a source to share


2 answers


While this is not exactly what you are looking for, I have found that using another comparison tool (like Kdiff) will indicate this much easier. (They emphasize differences in character. I have not tried merging this way)

After using this now, I can no longer use the inline diff for Visual Studio.

Some resources for customization:



http://www.ytechie.com/2008/12/advantages-of-a-3rd-party-diffcompare-tool.html

http://blogs.msdn.com/jmanning/articles/535573.aspx

+1


a source 


patch -l

ignores spaces.



I don't think the more general substring level is a good idea for code if it is not interactive; if the line you touched changed there is a good chance that something will break.

+1


a source






More articles:


All Articles