Am 21.12.2011 12:12, schrieb Aaron J. Seigo:
On Wednesday, December 21, 2011 11:45:16 Martin
=?ISO-8859-1?Q?Gr=E4=DFlin?=
wrote:
Am 21.12.2011 11:20, schrieb Aaron J. Seigo:
> hi :)
>
> some of you will have noticed that there is now a KDE/4.8 branch
in
> the
> modules. i would like to request that all fixes happen in the
KDE/4.8
> branch
> and then:
>
> * if kde-workspace, cherry-pick into master
> * otherwise, merge origin/KDE/4.8 into master
>
> if the merge fails, then you can resort to cherry-picking ...
as long as scripty is not active for master, I would suggest that we
go
for merging from origin/KDE/4.8 to master as well.
for kde-workspace?
yes. I did that with 4.7 till scripty started to process in master
again. Then it just became an unmergeable mess. So at least for the next
few weeks it should work if everyone sticks to it.
Cheers
Martin
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
