I wrote:
Some sort of 'devel' branch, branched off 'maint' and current 'master', merging 'maint' after releases.
Like to today's 'master' but without unfinished features other than code behind #ifdef LDAP_DEVEL. That way it can be merged into
maint now and then (like before a release), which has to be easier than cherry-picking all the time.
Er, s/before/after/ a release:-)