Menu
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.
887
We can manually resolve the merge conflict by editing the content in the bottom pane, and then saving the file using :wqa (Write and Quit all files). Once the conflict resolution is successful, the merged file will be staged for commit. git commit -m 'Merged from multiple branches' .
KDiff3 is a file and directory diff and merge tool which compares and merges two or three text input files or directories, shows the differences line by line and character by character(!), provides an automatic merge-facility, has an editor for comfortable solving of merge-conflicts, provides networktransparency via ...
A (BASE) ‐‐> Original file that currently sits in remote repo. B (LOCAL) ‐‐> Your file. This shows only your changes as compared to A. C (REMOTE) ‐‐> Their file.
Clicking the merge button in KDiff3 restarts the merge process.
To continue the merge, you must save the file after resolving the merge conflicts.
124
The three sections you see at the top of the window are section A, section B and section C.
Search for the section at the bottom left which shows the text "merge conflicts"
Right click on that line and select the parts from B and C that you want to merge, save and exit.
21
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
