Merge or Cherry-Pick?

[Wolfgang Rohdewald]

On Dienstag 01 Februar 2011, Thiago Macieira wrote:
> > That's not always true. Some changes will be specific to
> > 4.6, because sections of code in master can get rewritten,
> > features added or removed, so the changes won't be
> > applicable there.
> 
> That's not a problem or an excuse.
> 
> Make the change in 4.6, merge to master, fix the conflicts and
> then push both  branches.

if I continue developing the app in master and fix some bugs on
the way, the fixes will be in master first. I would not always
want to put them into 4.6 at once because testing in master is
much easier and comes at much less cost while development goes
on. So I might even want to wait some days or even weeks until
backporting fixes.

-- 
Wolfgang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110202/af13db4d/attachment.htm>