[Bug 259574] conflict resolution box appears a lot

[Arne Babenhauserheide]

https://bugs.kde.org/show_bug.cgi?id=259574


Arne Babenhauserheide <arne_bab at web.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |arne_bab at web.de




--- Comment #13 from Arne Babenhauserheide <arne_bab web de>  2011-06-15 00:29:30 ---
This happens a lot for me, too - much more, since I updated from VCS version to
4.6.4 - and it disturbs my workflow a lot, even while I’m in other programs.

I understand that conflicts might be hard (if not impossible) to avoid in a
concurrent system, but I don’t really look at the messages myself but just
click them away. So I’d need a way to say “always keep both”. 

Means: Just make sure I don’t lose data, and otherwise don’t disturb me. 

Besides: I use bogofilter, too.

-- 
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.