Merge or Cherry-Pick?

[Stefan Majewsky]

On Mon, Jan 31, 2011 at 11:34 PM, Arno Rehn <kde-devel at arnorehn.de> wrote:

> (Feature branches are a different thing).


Am I right that these should be rebased instead of merged?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110131/e7edc910/attachment.htm>