I have three files with SQL INSERT statements, local base_ie_common_ancestor other. diff3 refuses to merge local base other without conflicts since local deletes last line while other appends more stuff after last line. Why is this a conflict? Delete the last line since base and other don't have it, append the rest from other since l...
I have a perl script that determines what external diff to use depending on the file's content. I would like to use it determine external diff3 also. Which is the best method to know how my script is being called? I was planning to catch the last three parameters, and verify if they are all files, to use the diff3 options, but I'm hopi...
Is it possible to set Git up so that I can use the three-way compare in KDiff3? I have two branches that are far too different to auto-merge them, I simply have to check each merge point and I think the best way would be to check out the branch I want the changes from the other branch and say git difftool HEAD_OF_OTHER_BRANCH -- . An...
Assume that files MINE and YOURS are descendants of OLD. FILE_MINE= abc def ghi FILE_OLD= abc jkl ghi FILE_YOURS= abc def ghi Command diff3 -m MIND OLD YOURS gives: abc <<<<<<< OLD jkl ======= def >>>>>>> YOURS ghi diff3 cannot resolve that MINE and YOURS made identical changes. Why? And, is there a way to resolve this...