Github user FlorianHockmann commented on the issue:
https://github.com/apache/tinkerpop/pull/704
Thanks for the explanation @spmallette. I was about to ask about the
approach for merging pull requests as the documentation only talks about the
case where separate pull requests are used for the different release branches.
(Maybe we should extend that for simpler cases where only a pull request to
tp32 is enough?)
I just tried to merge tp32 to master, but ran into a merge conflict as
apparently the changes from TINKERPOP-1744 (PR #690) are missing in master
although GitHub shows the merge commit also for the master branch:
https://github.com/apache/tinkerpop/commit/6a3fc39a912bec98707dd69d461955330627df10
Do I now have to cherry-pick them to get them into master before I merge
tp32 or what is the best approach in cases like this?
I'll close the JIRA ticket as soon as the changes are also in master.
---
