[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-panel-devel
Subject:    Re: qml systemtray: small refactorings
From:       "Aaron J. Seigo" <aseigo () kde ! org>
Date:       2012-10-26 6:50:12
Message-ID: 1923763.IAvrfmFmfm () freedom
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


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.

-- 
Aaron J. Seigo
["signature.asc" (application/pgp-signature)]

_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel


[prev in list] [next in list] [prev in thread] [next in thread]