Hello, On Tue, Oct 23, 2012 at 12:59:16AM -0700, Vishesh Kumar wrote: > > This <https://github.com/sympy/sympy/pull/1220#issuecomment-8535080> comment > made me believe that my pull request had been merged with the main sympy > master branch.
This is not the case; when a pull request is merged (and closed), it gets a red badge reading "Closed" (like in [0], for example). You might have been misled by sympy-bot's statement Passed after merging Visheshk/algebraic (0cd6264) into master (c49dca1). This does not mean, however, that your changes have been included into SymPy's main code base. Instead, the message describes what sympy-bot did _locally_, on Julien's (jrioux) computer: it pulled your branch and merged the changes into the _local_ version of the master branch, in order to be able to run the tests. The official master branch in the main repository has not been altered, so your changes have not been merged yet. > But the merge conflicts beneath it shows that the edits of my pull > request have not shifted on while the rest of the assert syntax has > changed. Yes, that's right. > Should I update the files to try and resolve this merge conflict? Yes, that's what you should do. If you're not sure how to do it, don't hesitate to ask. > And after that, what else should I do so that these edits get > merged? You should insist that people review your branch by posting a corresponding comment on your pull request discussion page, maybe using the @-syntax to mention certain developers. Nevertheless, expect that you will not get immediate reaction; patience is a highly praised quality :-) Usually, the sympians react quickly, though. > Who would be reviewing changing for ask(Q.algebraic)? I don't think there is a fixed person responsible for that; your E-mail should have got the attention of the knowledgeable, though. > And it still doesn't compute correctly for logarithmic and trignometric > functions, because I couldn't understand how to add checks for those kinds > of queries. Would appreciate help in that respect too! I'd recommend that you formulate what exactly you don't understand in a comment on your pull request. In this way people will be able to give better answers. Sergiu -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
