If there is a known dependency, you can base one branch on top of another. In general, though, if two pull requests are making incompatible changes, the one merged second will have to fix the merge conflicts.
Aaron Meurer On Wed, Apr 1, 2015 at 4:35 PM, Christophe Bal <projet...@gmail.com> wrote: > Hello. > > I'm learning git and I have a question abut the way the core developers of > sympy manages the multiple pull requests with potential conflict. How do you > do that ? > > > Christophe BAL > Enseignant de mathématiques en Lycée et développeur Python amateur > --- > French math teacher in a "Lycée" and Python amateur developer > > -- > 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 http://groups.google.com/group/sympy. > To view this discussion on the web visit > https://groups.google.com/d/msgid/sympy/CAAb4jGk-3A4mX1o3u87HQ34DK09wR7cc1zHveqGAUBtb4DUAhA%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 http://groups.google.com/group/sympy. To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CAKgW%3D6%2BqzpGm_7zO4KLfm9wJnYpZ_5ASzdwcJShBNqxA2OLXeg%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
