Re: [Twisted-Python] non-merge commits to trunk & "review" keyword

2017-03-07 Thread Glyph Lefkowitz
> On Mar 7, 2017, at 10:40 AM, Craig Rodrigues wrote: > > > > On Mon, Mar 6, 2017 at 8:37 PM, Glyph Lefkowitz > wrote: > > > Craig, since you're the one who made this merge, can you explain what > happened?

Re: [Twisted-Python] non-merge commits to trunk & "review" keyword

2017-03-07 Thread Craig Rodrigues
On Mon, Mar 6, 2017 at 8:37 PM, Glyph Lefkowitz wrote: > > > Craig, since you're the one who made this merge, can you explain what > happened? Has github's 'merge' button stopped prompting for a commit > message? Failing to wait for the removal of the 'review' keyword

Re: [Twisted-Python] non-merge commits to trunk & "review" keyword

2017-03-07 Thread Tristan Seligmann
On Tue, 7 Mar 2017 at 09:56 Glyph Lefkowitz wrote: > On Mar 6, 2017, at 9:02 PM, Tristan Seligmann > wrote: > > On Tue, 7 Mar 2017 at 06:38 Glyph Lefkowitz > wrote: > > > This is definitely bad, forbidden by existing

Re: [Twisted-Python] non-merge commits to trunk & "review" keyword

2017-03-06 Thread Glyph Lefkowitz
> On Mar 6, 2017, at 9:02 PM, Tristan Seligmann wrote: > > On Tue, 7 Mar 2017 at 06:38 Glyph Lefkowitz > wrote: > > This is definitely bad, forbidden by existing policy, etc. In fact I > remember adjusting

Re: [Twisted-Python] non-merge commits to trunk & "review" keyword

2017-03-06 Thread Tristan Seligmann
On Tue, 7 Mar 2017 at 06:38 Glyph Lefkowitz wrote: > > This is definitely bad, forbidden by existing policy, etc. In fact I > remember adjusting the settings so that the 'merge' button would always > create a merge commit; in fact, the configuration is still set that

Re: [Twisted-Python] non-merge commits to trunk & "review" keyword

2017-03-06 Thread Glyph Lefkowitz
> On Mar 6, 2017, at 6:03 PM, Jean-Paul Calderone > wrote: > > Hello, > > GitHub apparently allows fast-forward merges to trunk. Here's an example of > one: > > https://github.com/twisted/twisted/pull/730 > > >

[Twisted-Python] non-merge commits to trunk & "review" keyword

2017-03-06 Thread Jean-Paul Calderone
Hello, GitHub apparently allows fast-forward merges to trunk. Here's an example of one: https://github.com/twisted/twisted/pull/730 This doesn't seem like a good thing. - The ticket is still open - There is no merge commit - There is no merge commit message - There are non-merge