Re: [sympy] Non existent merge conflicts on Github Pul Requests

2015-12-28 Thread Jason Moore
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 wrote: > I just played with it and apparently it only does that if you enable > required status checks in the branch protection settin

Re: [sympy] Non existent merge conflicts on Github Pul Requests

2015-12-28 Thread Aaron Meurer
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

Re: [sympy] Non existent merge conflicts on Github Pul Requests

2015-12-28 Thread Jason Moore
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

Re: [sympy] Non existent merge conflicts on Github Pul Requests

2015-12-28 Thread Jason Moore
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 wrote: > Where does this bu

Re: [sympy] Non existent merge conflicts on Github Pul Requests

2015-12-28 Thread Aaron Meurer
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 wrote: > Howdy, > > Github has this new "Update Branch" button which will automatically merge in > changes from master to your Pull Request. This is pretty convenie

[sympy] Non existent merge conflicts on Github Pul Requests

2015-12-28 Thread Jason Moore
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