On Monday, January 31, 2011, Thiago Macieira wrote: > 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.
this was before i did any cherry-picks myself, but perhaps others had already beat me to it. in any case, is there a way to fix it so that the 4.6 branch would become mergeable with master, or do we now basically just have to wait for a 4.7 branch? -- 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
signature.asc
Description: This is a digitally signed message part.