Initial merge (was: Re: Merge or Cherry-Pick?)

[Thiago Macieira]

Em sexta-feira, 4 de fevereiro de 2011, às 15:27:49, Oswald Buddenhagen 
escreveu:
> and i'm strongly opposed to merging any previous branches back to master
> with -s ours, as this will effectively rewrite history (we did *not*
> merge back, and claiming that now will possibly hide actual omissions).

I don't think that's the message here. The message of the -s ours merge is 
that no forward-porting of fixes is necessary, so it's easy to find out what 
changes need to be forward-merged.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  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: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110204/a935a1ac/attachment.sig>