I’m trying out the Windows version of KDiff3. I have 3 files. The first is the
base file (i.e., the file that I started with). The 2nd is one file that was
change and the 3rd is another file that was changed.
So I made the 1st be A, the 2nd be B and the 3rd be C.
Some of the changed lines claim to be conflicts but they are not. A and B are
the same (i.e., B was not changed including line endings). C has been changed
on those lines. But KDiff3 claims these lines are conflicts. Am I doing
something wrong?
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Anonymous
-
2011-09-18
My error. The word "conflict" here is misleading. The program is calling all
differences, even though the differences don't conflict, a "conflict".
Also, it is a little weird that if you click on a line (in the bottom section)
and then use the A, B or C buttons, it does not necessarily change the line
you have clicked on.
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
I’m trying out the Windows version of KDiff3. I have 3 files. The first is the
base file (i.e., the file that I started with). The 2nd is one file that was
change and the 3rd is another file that was changed.
So I made the 1st be A, the 2nd be B and the 3rd be C.
Some of the changed lines claim to be conflicts but they are not. A and B are
the same (i.e., B was not changed including line endings). C has been changed
on those lines. But KDiff3 claims these lines are conflicts. Am I doing
something wrong?
My error. The word "conflict" here is misleading. The program is calling all
differences, even though the differences don't conflict, a "conflict".
Also, it is a little weird that if you click on a line (in the bottom section)
and then use the A, B or C buttons, it does not necessarily change the line
you have clicked on.