Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/457
good to know they both work. i sorta figured `merge` would be ok in this
case as github would just figure out the diff and only include his one commit.
when we merged that to our stuff, it wouldn't mess up history as it came from a
fork. though i wonder if merge would bring an ugly "merge" commit with it. if
it did, then i was wrong and `git rebase` would have been the way to go.
@pauljackson since @robertdale confirmed that `git rebase` is good,
perhaps you should go that route to keep our history neat.
---
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.
---
