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 <[email protected]> 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 [email protected]. > To post to this group, send email to [email protected]. > 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 [email protected]. To post to this group, send email to [email protected]. 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.
