search

foglcz / JSONRpc2

Generic JSON-RPC v2 implementation
Other
19 stars 10 forks source link

Add support for JSON-RPC 1.x and tweak some error messages #6

Closed scottchiefbaker closed 10 years ago

scottchiefbaker commented 10 years ago

I'm closing this pull request for now. I've made some substantial changes to the code, so the pull request is a pretty massive change at this point.

I'd be happy to discuss the changes I made and collaborate in the future if you're interested.

foglcz commented 10 years ago

HI, sorry, we've been finishing a project these past two weeks and there was zero time to respond to anything..

I've reopened the issue & granted you write permissions to manage the sourcecode if you're interested.

I will continue with merging the pull request tommorow + doing some tweaks if need be. Overall however, since you're using the library actively (I'm not at this very moment), it would be best just to update the repo directly if you're missing a function.

Thanks!

scottchiefbaker commented 10 years ago

On 02/14/2014 08:25 AM, Pavel Ptacek wrote:

HI, sorry, we've been finishing a project these past two weeks and there was zero time to respond to anything..

I've reopened the issue & granted you write permissions to manage the sourcecode if you're interested.

I will continue with merging the pull request tommorow + doing some tweaks if need be. Overall however, since you're using the library actively (I'm not at this very moment), it would be best just to update the repo directly if you're missing a function.

I made some pretty substantial changes to the code. I didn't want to step on your toes. Have you had a chance to look at what I did? I want to respect your original work.

scottchiefbaker commented 10 years ago

I was going to push all my changes in to your repo this morning but I got a huge merge conflict. All my code is tab indented, and yours is space indented. Should I convert it back to spaces before I push?

foglcz commented 10 years ago

Hi, resolve it using yours, leave the tabs option (i changed my IDE settings, so everything should be fine :))

Thanks, Pavel

On Thu, Feb 20, 2014 at 5:09 PM, Scott Baker notifications@github.comwrote:

I was going to push all my changes in to your repo this morning but I got a huge merge conflict. All my code is tab indented, and yours is space indented. Should I convert it back to spaces before I push?

— Reply to this email directly or view it on GitHubhttps://github.com/foglcz/JSONRpc2/pull/6#issuecomment-35637621 .