Github user spmallette commented on the issue:

    https://github.com/apache/tinkerpop/pull/457
  
    well - your `tp31` is now out of date because a number of changes 
(including the one that i need to test this branch with) have been added to 
that branch that are not in yours. If you were working in our repository I 
would say that to get those changes you should rebase which will effectively 
bring in the new changes and more your commits to the head of all those changes.
    
    But it occurs to me now that you are working from a fork and perhaps you 
just need to merge `upstream/tp31` (our repo - i assume you called the remote 
"upstream") into your fork. I don't think you need to rebase your fork.


---
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.
---

Reply via email to