Merge or Cherry-Pick?

Dawit A adawit at
Mon Jan 31 23:37:32 GMT 2011

On Mon, Jan 31, 2011 at 5:27 PM, Thiago Macieira <thiago at> wrote:
> On Monday, 31 de January de 2011 22:58:52 Andreas Pakulat wrote:
>> Hi,
>> 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?
> Commit to 4.6, merge 4.6 into master.

Doesn't that conflict the true and tried workflow of never back
porting fixes that have not received some testing into a stable branch
? To me this seems to do things in reverse. Perhaps the workflow is
supposed to be different in git ?

More information about the kde-core-devel mailing list