kde-runtime module master and KDE/4.9 branches
lpapp at kde.org
Tue Oct 9 19:54:38 BST 2012
I think David took the responsibility for the merge:
On Tue, Oct 9, 2012 at 3:36 PM, Aleix Pol <aleixpol at kde.org> wrote:
> I'm sending this e-mail because I was experiencing some bug with the
> ScrollBar and I thought about fixing it. Then I decided to commit it
> in KDE/4.9 because it's a bugfix and I realised it's already in 4.9,
> it's just not in master.
> My natural reaction was to see if we could merge KDE/4.9 to master,
> that was the git output . Besides the normal .desktop files
> conflicts there were a lot of .cpp and .qml changes that conflicted
> (mostly Plasma Components and some Nepomuk).
> So, should I look into merging those? Maybe there are more things
> fixed in 4.9 that aren't in master...
> Should we make sure this won't happen again? If so, how?
>  http://paste.kde.org/565196/
More information about the kde-core-devel