qml systemtray: small refactorings

Dmitry Ashkadov dmitry.ashkadov at rosalab.ru
Fri Oct 26 07:35:57 UTC 2012


26.10.2012 10:50, Aaron J. Seigo пишет:
> On Friday, October 26, 2012 10:04:24 Dmitry Ashkadov wrote:
>> Thank you for your answer. What workflow does KDE team use to bring
>> changes from master branch to KDE4.X branch? For example, some fixes
>> should be applied to master and KDE4.X branches at the same time.
> if they are bug fixes, then the preferred means is to do them in the latest
> stable branch (e.g. 4.10 or whatever) and then merge that into master; if
> merge fails due to conflicts (which often happens eventually over the course of
> a devel cycle) then we restor to cherry-picks from branch into master.

Thank you! Is somebody who periodically merges KDE 4.X to master or it 
must be made by who fixes bug?
If I do some refactoring what branch should I use? As I understand I 
should use master and my changes will be brought to next KDE release 
(4.11) only?


More information about the Plasma-devel mailing list