Github user spmallette commented on the pull request:
https://github.com/apache/incubator-tinkerpop/pull/265#issuecomment-197813423
in this specific case of "retargeting to tp31" you should have just
probably cherrypicked your commit from your master to your tp31 branch and then
re-issued your pull request to our tp31. undoing this mess is beyond the scope
of what i can offer as help here, but merging master into tp31 is the exact
opposite direction our merge flows goes.
The "right way" to offer PRs to TinkerPop is to first create an issue in
JIRA:
https://issues.apache.org/jira/browse/TINKERPOP/
It is in there or through discussion on the dev mailing list that you can
communicate with core developers on the project about which branch it should
target. Then you should likely create a branch in your fork from the TinkerPop
branch you intend to target and do your work in there. Finally, issue your PR
and await review. More information on this process is outlined in the developer
docs:
http://tinkerpop.apache.org/docs/3.1.1-incubating/dev/developer/#_contributing
---
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.
---
