Merge or Cherry-Pick?

Thiago Macieira thiago at
Wed Feb 2 14:56:56 GMT 2011

Em quarta-feira, 2 de fevereiro de 2011, às 11:46:20, 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.

Laziness is not an argument -- it's just an excuse.

If you find a bug that applies to 4.6, why will you not fix it there?

In my experience, testing the *stable* releases is easier. Testing the 
development versions usually cause trouble because of unfinished features and 
untested new code.

Thiago Macieira - thiago (AT) - thiago (AT)
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <>

More information about the kde-core-devel mailing list