> On Mar 6, 2017, at 9:02 PM, Tristan Seligmann <mithra...@mithrandi.net> wrote: > > On Tue, 7 Mar 2017 at 06:38 Glyph Lefkowitz <gl...@twistedmatrix.com > <mailto:gl...@twistedmatrix.com>> 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 way. > > Rebase merging was allowed when I checked earlier, so I disabled it (I guess > I managed to do this before you looked at the configuration).
Perhaps I only did this for some other repos, then. Did I miss your announcement of this? Hint, hint? :) > I suspect that is what happened here, but note also that these settings only > control what is possible by pressing the merge button on GitHub; you can > construct commits locally however you like and push them, as long as you get > green commit statuses for all the mandatory commit checks. Is this true even for people with just repo:write? -glyph
_______________________________________________ Twisted-Python mailing list Twisted-Python@twistedmatrix.com http://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-python
