Github user jeking3 commented on the pull request:
https://github.com/apache/thrift/pull/460#issuecomment-95959732
Actually the merge is correct; I don't know why github decided to make it
difficult. The diffs are accurate.
I did this work on top of THRIFT-2441 on my fork. THRIFT-2441 was merged
into master; these commits should have dropped away from the pull request
leaving only the new content.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
