While using KDiff3 to resolve merge conflicts, how do I save the resolved copy of the A and B versions?
I open KDiff3 to resolve merge conflicts. I am able to resolve each conflict by selecting the desired version. When I have resolved all of the conflicts, I click the merge button. Then I try to save, but a prompt appears saying that there merge conflicts are still present.
Clicking the
mergebutton in KDiff3 restarts the merge process.To continue the merge, you must save the file after resolving the merge conflicts.