Merge or Cherry-Pick?

[Thiago Macieira]

On Monday, 31 de January de 2011 14:44:38 Aaron J. Seigo wrote:
> On Monday, January 31, 2011, Andreas Pakulat wrote:
> > something that hasn't been written down as far as I can see (if I
> > overlooked it, please point me to it) is what the policy on kdelibs is
> > to be now wrt. merging vs. cherry-picking of changes in branches and
> > master?
> 
> what i've started doing for bugfixes is to apply the fix to the stable
> branch (e.g. 4.6) and then cherry-pick that into master. when i tried to
> merge the 4.6 branch into master, i just got a ton of conflicts, so i
> stopped trying that :)

Because of the cherry-picks.

-- 
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/20110201/70723cf3/attachment.sig>