Github user jorgebay commented on the issue:
https://github.com/apache/tinkerpop/pull/889
awesome!
First, lets restore `tp32` on your repo:
```
git fetch upstream tp32
git checkout tp32
git reset --hard upstream/tp32
git push origin tp32
```
Once you did that, you can try to rebase.---
