Menu ▾ ▴

#163 Cannot save merge

open
nobody
None
5
2012-09-23
2012-01-11
hal
No

I use git and kdiff3 Version 0.9.95. I have pulled a remote master branch to my local repository. I try to use kdiff3 to solve merge conflicts. The visual interface of kdiff3 (in Windows 7) fires up and shows all the conflicts in a file. For each conflict I choose wich version to use (A or B). When I am done I want to merge. Then I push the merge button. But then a window pops up saying that all the conflicts are still there, and I cannot save the merge!!???
Sometimes another window pops up that only shows two progression bars and nothing happens. Even after waiting considerable time.

Discussion

  • hal

    hal - 2012-01-11

    CannotSaveMerge

     
    Thumbnail
    kdiff3.png

  • Joachim Eibl

    Joachim Eibl - 2012-01-12

    When the output window is visible then you are already in merge mode.
    Then you can choose the inputs A or B or C (if exists).
    Sometimes you want all changes from either side. There are some actions in the "Merge"-menu for that. ("Choose A for all conflicts" etc.)

    When you are done (no conflicts left) you should be able to save.
    You can also try to exit and KDiff3 will ask you to save if no conflicts are
    left.

    Pressing the merge button restarts the merge and you must start again. (But
    there should have been a warning about this.)

    Your attached screenshot also shows the small "Conflicts" window. When pressing the "Ok" button there, then it should disappear and with it the window with the progress bars.

    Best regards,
    Joachim

     
auth0 logo