Empty merges per release

Thiago Macieira thiago at kde.org
Wed Apr 27 08:40:08 BST 2011

I know we decided to use cherry-picks to bring commits from past versions to 
master, but this has caused that the 4.5 and 4.6 commits are never in the past 
history of master.

I recommend at least once, after a release, that the tag is merged back into 
master, using strategy "ours" if necessary.

This will make master report to be about a few hundred commits past the v4.6.1 
tag, instead of 3500 commits past v4.4.85.

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/20110427/a2853001/attachment.sig>

More information about the kde-core-devel mailing list