Github user jeking3 commented on the issue:
https://github.com/apache/thrift/pull/930
It looks like you merged instead of rebasing.
If memory serves you had 11 commits originally.
What I would recommend is that you:
1. git checkout master
2. git fetch upstream master (you need to have upstream configured per
github's instructions)
3. git merge FETCH_HEAD
Now your fork's master will match the master in github.
4. git checkout -b redo/THRIFT-3369
5. git cherry-pick <each of your 11 commits in order from earliest ot
latest>
6. git push ... to github
7. open another pull request
8. close this pull request
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
