Why aren't we merging them again? I don't remember the reasoning for that. I'll cherry pick the changes into master today, although I don't remember us deciding on not merging when we do a release. This seems kind-of weird. On Mar 28, 2013 6:04 AM, "Braden Shepherdson" <[email protected]> wrote:
> I think I saw a bunch of git commit messages go by that were committing > things to 2.6.x. > > Remember that the intended flow is that things get committed to master and > then cherry-picked into 2.6.x if they're critical fixes. > > We WILL NOT ever merge master and 2.6.x in either direction, so commits > that only exist in 2.6.x will be lost if they are not cherry-picked into > master. > > Braden >
