These are chat archives for vu3rdd/functorrent

20th
Jul 2015
Jaseem Abid
@jaseemabid
Jul 20 2015 14:25
@dfordivam @vu3rdd There?
@dfordivam Tests are failing on your PR. Please fix that and merge asap
Lets get this rolling again. I hope to Idle here a lot more often from now
Ramakrishnan Muthukrishnan
@vu3rdd
Jul 20 2015 15:46
hello @jaseemabid
Jaseem Abid
@jaseemabid
Jul 20 2015 15:47
Awesome.
I think I'll fix the test issues on @dfordivam 's PR and merge it, unless he comes back now
and does it himself
That is going to stagnate forever unless we do it now.
And sadly he came up with an insanely large PR
I'll carefully go through the code once anyway. Will file bugs for all the comments.
Ramakrishnan Muthukrishnan
@vu3rdd
Jul 20 2015 15:55
OK
Divam
@dfordivam
Jul 20 2015 16:40
@jaseemabid will do it tomo, meanwhile you go through PR
Jaseem Abid
@jaseemabid
Jul 20 2015 16:43
Yes. I'll do that.
Jaseem Abid
@jaseemabid
Jul 20 2015 16:51
If possible, keep your history linear. Rebase on top of HEAD
Jaseem Abid
@jaseemabid
Jul 20 2015 16:58
The topic branch diverged from master. the merge is not clean. So please rebase your changes on top.
Normally I dont say this, but in this particular case, it might be a good thing to squash the PR into one commit.
$ git reset --hard HEAD
$ git remote add origin https://github.com/bangalore-haskell-user-group/functorrent/
$ git fetch
$ git checkout dfordivam:server-design
$ git rebase origin/master
$ git push https://github.com/dfordivam/functorrent server-design --force
A good commit history will help understand the code a lot in future. Please dont take it for granted
Jaseem Abid
@jaseemabid
Jul 20 2015 17:05
Also I think you did your changes on top of some code by ramki. So this PR is a mix of everything.