Bug 231040

Version:           4.0.0 (using KDE 4.3.2)
Compiler:          gcc 4.4.1 Ubuntu 9.10 compiled binary
OS:                Linux
Installed from:    Ubuntu Packages

I've had some issues with an svn my group is using to develop a project.
A commit I made had many conflicts so I chose to fix them by using Kompare to add my changes into the original code.

One option that I could really find useful but is absent, is to add my changes to the code, but keep the target code intact as well.
(I.E. no deleting of target file's code when applying differences, even if it conflicts with my original source file)

So let's say I add one big comment to my file, but I'm missing another comment someone added to the main project.
I should be able to take my file (which is independent of the project), load up Kompare, have it show the differences, but be able to "Apply Differences" that won't remove anything from the target file.

In my personal opinion, this would work great if you had toolbar buttons that are colour-coded to the highlights of the diffs, so clicking on the red arrow to "Apply Differences" would only apply 'change' changes, green arrow would apply 'delete' changes, and blue would apply 'add' changes to target.

I would want to only apply add changes and change changes to the project.

Thanks!