Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/618
the merge commit is acceptable in this case. i'd even expect a follow on
commit to fix test problems and such. `git merge` should give us as clean a
history as we can get i this situation. thanks for asking on how to proceed.
---
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.
---
