Github user jeking3 commented on the issue:
https://github.com/apache/thrift/pull/1361
Try this:
```
git checkout master
git pull upstream master
git checkout -b THRIFT-4329-take-2
git cherry-pick 1d1d9d8
git cherry-pick 0aedc8a
git cherry-pick 3df26ec
git cherry-pick 48ee1f5
git rebase -i HEAD~4
(change lines 2 through 4 from "pick" to "fixup")
git push -u origin THRIFT-4329-take-2:THRIFT-4329 --force
```
The last command will force your local branch THRIFT-4329-take-2 into the
github branch THRIFT-4329, which is your pull request.
---
