Cool, I'll remove that setting then so it will be back to normal. Thanks.
Jason moorepants.info +01 530-601-9791 On Mon, Dec 28, 2015 at 12:47 PM, Aaron Meurer <asmeu...@gmail.com> wrote: > I just played with it and apparently it only does that if you enable > required status checks in the branch protection settings (like requiring > travis-ci). I guess the idea is that you don't know if the tests are valid > with a new merge base or not. > > I guess this makes sense for repos where the tests run quickly and merging > results in a deployment somewhere. I think it makes less sense for SymPy or > PyDy since releases are done separately and occasional test failures in > master are not the end of the world, especially since this would mean > running the tests way more often and backing up the Travis queue even more > (at least for SymPy, that would be pretty bad). > > Aaron Meurer > > On Mon, Dec 28, 2015 at 12:55 PM, Jason Moore <moorepa...@gmail.com> > wrote: > >> Here is PyDy PR 315 (https://github.com/pydy/pydy/pull/315) for me: >> >> [image: Inline image 1] >> Note that the button is greyed out now, but if something gets merged to >> master (even if it doesn't conflict) the "merge pull request" will be >> disabled and the "update branch" button will be enabled. >> >> >> Jason >> moorepants.info >> +01 530-601-9791 >> >> On Mon, Dec 28, 2015 at 11:53 AM, Jason Moore <moorepa...@gmail.com> >> wrote: >> >>> It seems to show up only on PRs that you create. You can't update other >>> people's PRs. See an image here: >>> >>> >>> https://github.com/blog/2051-protected-branches-and-required-status-checks >>> >>> >>> Jason >>> moorepants.info >>> +01 530-601-9791 >>> >>> On Mon, Dec 28, 2015 at 10:57 AM, Aaron Meurer <asmeu...@gmail.com> >>> wrote: >>> >>>> Where does this button appear? I don't see it on any of my pull >>>> requests. >>>> >>>> Aaron Meurer >>>> >>>> On Mon, Dec 28, 2015 at 9:18 AM, Jason Moore <moorepa...@gmail.com> >>>> wrote: >>>> > Howdy, >>>> > >>>> > Github has this new "Update Branch" button which will automatically >>>> merge in >>>> > changes from master to your Pull Request. This is pretty convenient >>>> > (although you have to remember to pull your branch locally after you >>>> hit the >>>> > button), but it seems like the "Merge pull request" button goes gray >>>> on >>>> > non-related changes on master, forcing you to update with master when >>>> it >>>> > isn't necessary. I have some pull requests on the PyDy repo that >>>> affect >>>> > files that are not related to the files that were changed on the >>>> master >>>> > branch (i.e. no merge conflicts) and Github will not let me merge. I'm >>>> > pretty sure that wasn't the case before. It seems github is forcing an >>>> > update from master regardless of if there are merge conflicts are >>>> not. Am I >>>> > doing something wrong? >>>> > >>>> > Jason >>>> > moorepants.info >>>> > +01 530-601-9791 >>>> > >>>> > -- >>>> > You received this message because you are subscribed to the Google >>>> Groups >>>> > "sympy" group. >>>> > To unsubscribe from this group and stop receiving emails from it, >>>> send an >>>> > email to sympy+unsubscr...@googlegroups.com. >>>> > To post to this group, send email to sympy@googlegroups.com. >>>> > Visit this group at https://groups.google.com/group/sympy. >>>> > To view this discussion on the web visit >>>> > >>>> https://groups.google.com/d/msgid/sympy/CAP7f1AieYy2tTBAv3y-qXGQnz1zHSd7Z65hdOT79Ve84GOj-pA%40mail.gmail.com >>>> . >>>> > For more options, visit https://groups.google.com/d/optout. >>>> >>>> -- >>>> You received this message because you are subscribed to the Google >>>> Groups "sympy" group. >>>> To unsubscribe from this group and stop receiving emails from it, send >>>> an email to sympy+unsubscr...@googlegroups.com. >>>> To post to this group, send email to sympy@googlegroups.com. >>>> Visit this group at https://groups.google.com/group/sympy. >>>> To view this discussion on the web visit >>>> https://groups.google.com/d/msgid/sympy/CAKgW%3D6%2BLUTSZh4ktkGA88YoakgFw7JaROskSS8ZVxQrLTVa4Gw%40mail.gmail.com >>>> . >>>> For more options, visit https://groups.google.com/d/optout. >>>> >>> >>> >> -- >> You received this message because you are subscribed to the Google Groups >> "sympy" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to sympy+unsubscr...@googlegroups.com. >> To post to this group, send email to sympy@googlegroups.com. >> Visit this group at https://groups.google.com/group/sympy. >> To view this discussion on the web visit >> https://groups.google.com/d/msgid/sympy/CAP7f1Ag0--2ZAn8KvYC0BJ94o-MGOiALgt-n%3DOLAV7m63_Vo4w%40mail.gmail.com >> <https://groups.google.com/d/msgid/sympy/CAP7f1Ag0--2ZAn8KvYC0BJ94o-MGOiALgt-n%3DOLAV7m63_Vo4w%40mail.gmail.com?utm_medium=email&utm_source=footer> >> . >> >> For more options, visit https://groups.google.com/d/optout. >> > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sympy+unsubscr...@googlegroups.com. > To post to this group, send email to sympy@googlegroups.com. > Visit this group at https://groups.google.com/group/sympy. > To view this discussion on the web visit > https://groups.google.com/d/msgid/sympy/CAKgW%3D6%2BFfE70KWDF5vM81C-R60AxVP2xeWWbQ4uLDfWN3PSmYA%40mail.gmail.com > <https://groups.google.com/d/msgid/sympy/CAKgW%3D6%2BFfE70KWDF5vM81C-R60AxVP2xeWWbQ4uLDfWN3PSmYA%40mail.gmail.com?utm_medium=email&utm_source=footer> > . > > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to sympy+unsubscr...@googlegroups.com. To post to this group, send email to sympy@googlegroups.com. Visit this group at https://groups.google.com/group/sympy. To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CAP7f1AiToq2wxAoRGxiO4K0zOqiUbNToO9OFB183NBk-ibHJhg%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
