[pytest-dev] [proposal] abolishing the features branch

[Florian Bruhin]

Hi,

On Thu, Apr 13, 2017 at 06:25:22PM +0200, Ronny Pfannschmidt wrote:
> since quite a while now we keep a lot of code away from users by leaving
> it in the features branch,
> more recent detail https://github.com/pytest-dev/pytest/issues/2365
> where even i didn't realize we had a fix since half a year.

We probably just should do more feature releases then.

> and it has been a massive pain to keep merged with master over and over.

Didn't seem like a "massive pain" to me so far.

> As such i would like to stop using a features branch at all and return
> to having only master.

And not have any bugfix releases?

Florian

-- 
http://www.the-compiler.org | me at the-compiler.org (Mail/XMPP)
   GPG: 916E B0C8 FD55 A072 | http://the-compiler.org/pubkey.asc
         I love long mails! | http://email.is-not-s.ms/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://mail.python.org/pipermail/pytest-dev/attachments/20170413/3b245a7a/attachment.sig>