On Oct 13, 2013 1:08 PM, "David Nadlinger" <code@klickverbot.at> wrote:
>
> On Sun, Oct 13, 2013 at 12:57 AM, Jonathan M Davis <jmdavisProg@gmx.com> wrote:
> > […] and merges could continue to happen as normal on the master
> > branch with the fixes that actually need to get into the release then being
> > merge separately into the release branch.
>
> Another model is that pull requests that should go into the release
> are made against the release branch, where they can be merged back to
> master, avoiding cherry-picking (and thus duplicating) commits.
>

Or perhaps simply not merging new features / enhancements until the next release (requires self moderation).

Regards
--
Iain Buclaw

*(p < e ? p++ : p) = (c & 0x0f) + '0';