Github user pauljackson commented on the issue:
https://github.com/apache/tinkerpop/pull/457
It didnât look intuitively correct, but I didnât know what was normal.
Whatâs the easiest way to make this right, right, right? Just start over and
create a new pull request?
Thanks,
-Paul
From: Robert Dale [mailto:[email protected]]
Sent: Sunday, November 27, 2016 8:41 AM
To: apache/tinkerpop
Cc: Paul A. Jackson; Mention
Subject: Re: [apache/tinkerpop] TINKERPOP-1493 Groovy project doesn't build
on Windows (#457)
I didn't consider that your remote branch was behind. Duh. What should have
been done is a forced push git push -f origin tp31 to replace your remote
branch with your local branch. Instead git ended up doing a merge and the
history here looks a little weird because it pulled in all the changes since
your changes. But git does the right thing and it merges cleanly on tp31.
Build passes on Linux. Can't test on windows.
VOTE: +0.5
â
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-263122753>, or
mute the
thread<https://github.com/notifications/unsubscribe-auth/AAUcSGfiXS20htPRP2UbTre71Si2zbQQks5rCYhqgaJpZM4KVbcO>.
________________________________
---
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.
---