Well you shouldn't stall your work because of this. This is only an issue specifically if you use the "git rebase" command. If you only use the "git merge" command to resolve conflicts, there won't be an issue, because git merge doesn't create duplicate commits. In general, avoid any command that requires you to force push.
Even so, this can get complicated, because you may have to merge in changes from your branches if you need them, and it can be hard to keep track of what change should go in what branch, so if it is possible to merge the pull requests first, I would recommend it. Aaron Meurer On Thu, Jul 7, 2016 at 3:07 PM, SAMPAD SAHA <sampadsa...@gmail.com> wrote: > > > > Word of warning: avoid rebasing any of your branches if you do this. > Otherwise, you will end up with duplicate commits. > > Due to this reason, sometimes I feel like to wait for the other two > branches to be merged. > > > Regards > Sampad Kumar Saha > Mathematics and Computing > I.I.T. Kharagpur > > On Fri, Jul 8, 2016 at 12:32 AM, Aaron Meurer <asmeu...@gmail.com> wrote: > >> Use, for instance, >> >> git merge SF_integration >> >> That will merge in the SF_integration branch. >> >> Word of warning: avoid rebasing any of your branches if you do this. >> Otherwise, you will end up with duplicate commits. >> >> Aaron Meurer >> >> On Thu, Jul 7, 2016 at 2:22 PM, SAMPAD SAHA <sampadsa...@gmail.com> >> wrote: >> >>> I will create a new branch form ##11266 >>> <https://github.com/sympy/sympy/pull/11266>. Then How to merge in 11237 >>> and 11178 ? >>> >>> >>> >>> >>> Regards >>> Sampad Kumar Saha >>> Mathematics and Computing >>> I.I.T. Kharagpur >>> >>> On Thu, Jul 7, 2016 at 11:29 PM, Jason Moore <moorepa...@gmail.com> >>> wrote: >>> >>>> You can create a new branch and merge in 11237 and 11178, then start >>>> adding new commits. Once the two prereq branches are merged your new branch >>>> will merge cleanly into master. >>>> >>>> >>>> Jason >>>> moorepants.info >>>> +01 530-601-9791 >>>> >>>> On Thu, Jul 7, 2016 at 10:48 AM, SAMPAD SAHA <sampadsa...@gmail.com> >>>> wrote: >>>> >>>>> In PR #11266 <https://github.com/sympy/sympy/pull/11266> I want to >>>>> use the functionalities of Singularity Functions. The functionalities have >>>>> been inplemented at PR #11237 and #11178 . What should I do now? >>>>> Should I wait untill both the PRs of Singularity Functions gets merged or >>>>> is there any other ways? >>>>> >>>>> Thanking You >>>>> >>>>> Regards >>>>> Sampad Kumar Saha >>>>> Mathematics and Computing >>>>> I.I.T. Kharagpur >>>>> >>>>> >>>>> >>>>> -- >>>>> 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/CANzav4FP4C-mi7QU0n8uCLh%3DZrUOv%3DR-%2B-EqFbJ7ZJ6KBJrbtA%40mail.gmail.com >>>>> <https://groups.google.com/d/msgid/sympy/CANzav4FP4C-mi7QU0n8uCLh%3DZrUOv%3DR-%2B-EqFbJ7ZJ6KBJrbtA%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/CAP7f1Ag7Nu1hq5BkB%3DtDfnA74TPUGKYhErEN-mUj94pDCyAgYw%40mail.gmail.com >>>> <https://groups.google.com/d/msgid/sympy/CAP7f1Ag7Nu1hq5BkB%3DtDfnA74TPUGKYhErEN-mUj94pDCyAgYw%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/CANzav4HZ%3DHc2fQRrWKD7reHT0LYdb0%3Dzi35o%2BcyFkpdZEyD8wQ%40mail.gmail.com >>> <https://groups.google.com/d/msgid/sympy/CANzav4HZ%3DHc2fQRrWKD7reHT0LYdb0%3Dzi35o%2BcyFkpdZEyD8wQ%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%3D6K89hY3JuvDJTdNX3yge6QtTciQeWd-2Vbpd0HkM7ocTg%40mail.gmail.com >> <https://groups.google.com/d/msgid/sympy/CAKgW%3D6K89hY3JuvDJTdNX3yge6QtTciQeWd-2Vbpd0HkM7ocTg%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/CANzav4Ejrp-iZdc5-CmsOUmgGKbhNWt_UcVhvjMH-%3Df4pRhMqw%40mail.gmail.com > <https://groups.google.com/d/msgid/sympy/CANzav4Ejrp-iZdc5-CmsOUmgGKbhNWt_UcVhvjMH-%3Df4pRhMqw%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%3D6KxiE1H1VSuDPO7jCBoG4c79O-cJdP9EKfLRNzFjWP0aA%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
