On Thu, Oct 23, 2014 at 10:05 AM, Daan Hoogland <daan.hoogl...@gmail.com> wrote: > not nice, so merge back is no longer an option. I think I am almost > ready to admit to that. > >
I came to that conclusion a week or so ago. If we could keep master as the release branch until we were imminently releasing, it might not be an issue. But people don't seem to want to treat master as a release branch under feature freeze. So we end up branching - and the two start diverging (rapidly) - at best we can cherry-pick to keep the two similar. --David
