Re: [sympy] Beam bending Module

Thank You Aaron. It was quite easy and straight forward. Regards Sampad Kumar Saha Mathematics and Computing I.I.T. Kharagpur On Fri, Jul 8, 2016 at 12:47 AM, SAMPAD SAHA wrote: > > Even so, this can get complicated, because you may have to merge in > changes from

Re: [sympy] Beam bending Module

> 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. I too believe in this. Thank

Re: [sympy] Beam bending Module

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

Re: [sympy] Beam bending Module

> 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

Re: [sympy] Beam bending Module

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

Re: [sympy] Beam bending Module

I will create a new branch form ##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 wrote: > You can create a new

Re: [sympy] Beam bending Module

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 wrote: >

[sympy] Beam bending Module

In PR #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