Github user pauljackson commented on the issue:
https://github.com/apache/tinkerpop/pull/457
Thank you Robert. This was adequate, I think, to give me some things to
Google.
Iâve run these commands from my local clone of my fork. It looks like
that was all that was necessary. No new pull request. When I look at the status
of the old pull request in the main repo it has incorporated 24 other commits
since Oct 12 and the status of the request is that the Travis build is pending.
Hereâs the commands, if someone would be kind to review and confirm. Thanks.
âPaul
D:\Data\TEMP\@Other\tinkerpop>git fetch --all
Fetching origin
Fetching apache
remote: Counting objects: 8094, done.
remote: Compressing objects: 100% (823/823), done.
remote: Total 8094 (delta 1986), reused 1680 (delta 1678), pack-reused 5064
Receiving objects: 100% (8094/8094), 11.66 MiB | 1.53 MiB/s, done.
Resolving deltas: 100% (3030/3030), completed with 560 local objects.
From https://github.com/apache/tinkerpop
* [new branch] TINKERPOP-1211 -> apache/TINKERPOP-1211
* [new branch] TINKERPOP-1235 -> apache/TINKERPOP-1235
* [new branch] TINKERPOP-1292 -> apache/TINKERPOP-1292
* [new branch] TINKERPOP-1363 -> apache/TINKERPOP-1363
* [new branch] TINKERPOP-1372 -> apache/TINKERPOP-1372
+ 302df7c...69877a2 TINKERPOP-1389 -> apache/TINKERPOP-1389
(forced update)
* [new branch] TINKERPOP-1399 -> apache/TINKERPOP-1399
* [new branch] TINKERPOP-1420 -> apache/TINKERPOP-1420
* [new branch] TINKERPOP-1428 -> apache/TINKERPOP-1428
* [new branch] TINKERPOP-1434 -> apache/TINKERPOP-1434
* [new branch] TINKERPOP-1471 -> apache/TINKERPOP-1471
* [new branch] TINKERPOP-1473 -> apache/TINKERPOP-1473
* [new branch] TINKERPOP-1485 -> apache/TINKERPOP-1485
* [new branch] TINKERPOP-1490 -> apache/TINKERPOP-1490
* [new branch] TINKERPOP-1502 -> apache/TINKERPOP-1502
* [new branch] TINKERPOP-1506 -> apache/TINKERPOP-1506
* [new branch] TINKERPOP-1507 -> apache/TINKERPOP-1507
* [new branch] TINKERPOP-1508 -> apache/TINKERPOP-1508
* [new branch] TINKERPOP-1520 -> apache/TINKERPOP-1520
* [new branch] TINKERPOP-1527 -> apache/TINKERPOP-1527
* [new branch] TINKERPOP-1529 -> apache/TINKERPOP-1529
* [new branch] TINKERPOP-1529-variant2 ->
apache/TINKERPOP-1529-variant2
* [new branch] TINKERPOP-1530 -> apache/TINKERPOP-1530
* [new branch] TINKERPOP-1534 -> apache/TINKERPOP-1534
* [new branch] TINKERPOP-1538 -> apache/TINKERPOP-1538
* [new branch] TINKERPOP-1538-master -> apache/TINKERPOP-1538-master
* [new branch] TINKERPOP-1538-tp32 -> apache/TINKERPOP-1538-tp32
* [new branch] TINKERPOP-1541 -> apache/TINKERPOP-1541
* [new branch] TINKERPOP-1542 -> apache/TINKERPOP-1542
* [new branch] TINKERPOP-1543 -> apache/TINKERPOP-1543
* [new branch] TINKERPOP-1545 -> apache/TINKERPOP-1545
* [new branch] TINKERPOP-1545-tp32 -> apache/TINKERPOP-1545-tp32
* [new branch] TINKERPOP-1547 -> apache/TINKERPOP-1547
* [new branch] TINKERPOP-1548 -> apache/TINKERPOP-1548
* [new branch] TINKERPOP-1557 -> apache/TINKERPOP-1557
* [new branch] TINKERPOP-1561 -> apache/TINKERPOP-1561
* [new branch] TINKERPOP-1562 -> apache/TINKERPOP-1562
* [new branch] TINKERPOP-1564 -> apache/TINKERPOP-1564
* [new branch] TINKERPOP-919 -> apache/TINKERPOP-919
* [new branch] TINKERPOP-932 -> apache/TINKERPOP-932
* [new branch] example_python_promise -> apache/example_python_promise
227b85c..16180e1 master -> apache/master
4a4c526..4745fe1 tp31 -> apache/tp31
* [new branch] tp32 -> apache/tp32
* [new tag] 3.1.5 -> 3.1.5
* [new tag] 3.2.3 -> 3.2.3
D:\Data\TEMP\@Other\tinkerpop>git checkout tp31
Already on 'tp31'
Your branch is up-to-date with 'origin/tp31'.
D:\Data\TEMP\@Other\tinkerpop>git rebase upstream/tp31
fatal: Needed a single revision
invalid upstream upstream/tp31
D:\Data\TEMP\@Other\tinkerpop>git status
On branch tp31
Your branch is up-to-date with 'origin/tp31'.
nothing to commit, working tree clean
D:\Data\TEMP\@Other\tinkerpop>git remote -v
apache https://github.com/apache/tinkerpop.git (fetch)
apache https://github.com/apache/tinkerpop.git (push)
origin https://github.com/pauljackson/tinkerpop.git (fetch)
origin https://github.com/pauljackson/tinkerpop.git (push)
D:\Data\TEMP\@Other\tinkerpop>git rebase apache/tp31
First, rewinding head to replay your work on top of it...
Applying: TINKERPOP-1493 Groovy project doesn't build on Windows
D:\Data\TEMP\@Other\tinkerpop>git push origin tp31
To https://github.com/pauljackson/tinkerpop.git
! [rejected] tp31 -> tp31 (non-fast-forward)
error: failed to push some refs to
'https://github.com/pauljackson/tinkerpop.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
D:\Data\TEMP\@Other\tinkerpop>git pull
Merge made by the 'recursive' strategy.
D:\Data\TEMP\@Other\tinkerpop>git push origin tp31
Counting objects: 371, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (174/174), done.
Writing objects: 100% (371/371), 65.98 KiB | 0 bytes/s, done.
Total 371 (delta 174), reused 306 (delta 126)
remote: Resolving deltas: 100% (174/174), completed with 68 local objects.
To https://github.com/pauljackson/tinkerpop.git
47da753..d49f692 tp31 -> tp31
D:\Data\TEMP\@Other\tinkerpop>
From: Robert Dale [mailto:[email protected]]
Sent: Wednesday, November 23, 2016 9:57 AM
To: apache/tinkerpop
Cc: Paul A. Jackson; Mention
Subject: Re: [apache/tinkerpop] TINKERPOP-1493 Groovy project doesn't build
on Windows (#457)
Either one appears to work cleanly. Just update first - git fetch --all.
Obviously, make sure you're on your branch git checkout tp31.
Then either git rebase upstream/tp31 or git merge upstream/tp31.
Finally, push it back to your repo. git push or git push origin tp31 or
however it's named.
â
You are receiving this because you were mentioned.
Reply to this email directly, view it on
GitHub<https://github.com/apache/tinkerpop/pull/457#issuecomment-262536090>, or
mute the
thread<https://github.com/notifications/unsubscribe-auth/AAUcSBxnAokrl0MzVFnP5hDC5pN3O6sCks5rBFQ8gaJpZM4KVbcO>.
________________________________
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
