These are chat archives for symengine/symengine

24th
May 2015
Sumith Kulal
@Sumith1896
May 24 2015 05:48
Could anyone help me get the commits of sympy/symengine#406 on top of master, so that I can send a fresh PR with:
  • Merge conflicts resolved.
  • @shivamvats commits + my commits, If I add any.
Isuru Fernando
@isuruf
May 24 2015 05:49
Have you pulled the changes from shivamvats's repo?
Sumith Kulal
@Sumith1896
May 24 2015 05:51
I have set his git repo in the remote, so shivam/poly_initial accesses the branch locally.
Isuru Fernando
@isuruf
May 24 2015 05:53
Okay. then all you have got to do is checkout to that branch and then merge with master
Sumith Kulal
@Sumith1896
May 24 2015 06:01
Thanks @isuruf. It worked.
@isuruf Could you see if this sympy/symengine#454 is the right way to go forward. We'll close the other PR.
Sumith Kulal
@Sumith1896
May 24 2015 06:06
By that I mean, the git blameisn't getting affected anywhere, right?
Isuru Fernando
@isuruf
May 24 2015 06:07
Nope.
Are both of you going to work on the same PR?
Sumith Kulal
@Sumith1896
May 24 2015 06:10
Yeah, will it be a problem?
He has to finish some work on SymPy and then we have to do the hashtable implementation, till then it'll be mostly me. After that we'll work together.
Isuru Fernando
@isuruf
May 24 2015 06:14
Okay then. If two people are working on the same PR, then the person who support the PR can send a pull request to the other's branch and get them merged.
Since you are going to be the one working on this for a while, a new PR is okay, then @shivamvats could send a PR to your fork to update the PR.
Sumith Kulal
@Sumith1896
May 24 2015 06:15
Yep