[digikam] [Bug 374191] Unusable context menu entries in tags and people view

[Mario Frank]

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

--- Comment #30 from Mario Frank <mario.frank at uni-potsdam.de> ---
(In reply to Simon from comment #29)
> On 06/01/17 14:34, Mario Frank wrote:
> > https://bugs.kde.org/show_bug.cgi?id=374191
> >
> > --- Comment #28 from Mario Frank <mario.frank at uni-potsdam.de> ---
> > (In reply to Mario Frank from comment #27)
> > Oh, I just saw that I cannot apply the remaining part of my patch after I apply
> > your extended patch. I will upload a new patch for my remaining part. There is
> > some collision in leftsidebarwidgets.
> >
> The two patches I just uploaded should both be applicable to master and
> then merged without conflict. Doesn't that work for you? That would
> indicate that I messed up when creating patches.
> That is one reason why I like branching and merging much better than
> sending around patches, it can so easily create confusion...

I just reset hard to master, applied your dupes patch here, after that your
variant of my patch (https://bugs.kde.org/attachment.cgi?id=103229 ).
It broke in leftsidebarwidgets. I also tried it the other way around. Problem
in the same file but different line. I resolved it on my system. I'm just
compiling digikam. When everything is fine, I will upload my part again.

Branching is easier. But this conflict just occured because I worked on
multiple problems at the same time because they are somehow connected. If we
work on smaller chunks, this should be no problem.

-- 
You are receiving this mail because:
You are the assignee for the bug.