search

php / pecl-networking-ssh2

Bindings for the libssh2 library
http://pecl.php.net/package/ssh2
Other
51 stars 61 forks source link

Merge fix #23

Closed liborm85 closed 8 years ago

liborm85 commented 8 years ago

This PR fixed merging PR https://github.com/php/pecl-networking-ssh2/pull/16.

langemeijer commented 8 years ago

@liborm85 thank you for your fixes. I should have avoided the merge fail hell we've reached here. If you have any new changes (non-merge fixes) to this project, I would advise you to submit a PR for the entire thing, as long as they are in the same category (feature A and feature B should be separate from a PR with bugfixes)

I know this is not what @weltling asked before, but he is not doing the merging and I disagree with him. I have no problem reviewing a PR with separate bugfix commits. Apparently I do have a problem merging stuff correctly, sorry about that.

liborm85 commented 8 years ago

@langemeijer Ok, I will try in the future. Now I have no now changes or plans. When will the new release of the package with bugfix https://bugs.php.net/bug.php?id=72988 ? This bug is blocking me on one my project.

weltling commented 8 years ago

@langemeijer thanks for merging! I was intended to, that's why I asked @liborm85 to do the separation. Anyway looks good now, tests pass here so far.

Thanks.