Github user robertdale commented on the issue:
https://github.com/apache/tinkerpop/pull/457
I didn't consider that your remote branch was behind. Duh. What should have
been done is a forced push `git push -f origin tp31` to replace your remote
branch with your local branch. Instead git ended up doing a merge and the
history here looks a little weird because it pulled in all the changes since
your changes. But git does the right thing and it merges cleanly on tp31.
Build passes on Linux. Can't test on windows.
VOTE: +0.5
---
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.
---
