Github user spmallette commented on the issue:

    https://github.com/apache/tinkerpop/pull/777
  
    I just added the new toy graph infrastructure on #794 - as soon as that 
merges then we can finish this one up.
    
    @PBGraff something still sorta looks fishy here with the commit history. my 
expectation would be that this PR would have no commits except your own, but i 
still see some of mine (and others) in there. I don't know the full state of 
your fork, so it's hard to give advice, but perhaps you need to:
    
    1. update your fork's tp32 branch with the latest from tinkerpop
    2. `git checkout tp32`
    3. `git checkout -b TINKERPOP-1862-revised`
    4. cherry pick just your commits from TINKERPOP-1862 over to 
TINKERPOP-1862-revised
    5. kill the old TINKERPOP-1862 (local and remote) and rename it 
TINKERPOP-1862-revised appropriately by dropping the "-revised" then push that
    
    Then going forward all you should have to do is keep your fork's tp32 
branch updated and periodically: `git rebase origin/tp32` on the TINKERPOP-1862 
branch which will continually take all your changes and replay them on the head 
of your fork's tp32.
    
    If you have some other more elegant git solution, that's cool too....just 
providing the hammer solution to the problem in case you can't figure out 
anything better.


---

Reply via email to