[pytest-dev] pytest-2.8 / new branches

[holger krekel]

On Mon, Sep 21, 2015 at 12:44 +0000, Bruno Oliveira wrote:
> On Mon, Sep 21, 2015 at 9:40 AM holger krekel <holger at merlinux.eu> wrote:
> 
> > So what about these branches:
> >
> > - master: bugfixes (for current latest pytest release) which will
> >   usually be released in a new micro revision.
> >
> > - features: will result in a new minor or major revision.
> >
> > This satisfies these conditions:
> >
> > - newcomers will likely submit bugfixes/typos to master and thus don't
> >   need to get re-routed (like happen in the pytest-2.7/master cycle often)
> >
> > - we don't need to change branch names when we do a new minor/major release
> >
> > - "features" conveys an implicit meaning for master ("bugfixes")
> >
> sounds good?
> >
> 
> sounds good to me!

I've updated the PR accordingly:

    https://github.com/pytest-dev/pytest/pull/1038

and would like to have it merged it real soon so that other ongoing PRs can
be targetted correctly.

cheers,
holger