Merge or Cherry-Pick?

[Aaron J. Seigo]

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 :)

my git fu is not strong, however, so i'm near certain there must be better 
ways ...

-- 
Aaron J. Seigo
humru othro a kohnu se
GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA  EE75 D6B7 2EB1 A7F1 DB43

KDE core developer sponsored by Qt Development Frameworks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110131/d155418a/attachment.sig>