[
https://issues.apache.org/jira/browse/TINKERPOP-1493?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15701805#comment-15701805
]
ASF GitHub Bot commented on TINKERPOP-1493:
-------------------------------------------
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/457
Well - this isn't a rebase - it is a merge. See the ugly merge commit here:
d49f692f890d1c868f9de674901e14c34e7c20ba
For further explanation:
```text
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.
```
So you had it right up to here but then probably got rattled by the message
above and decided to then do the following:
```text
D:\Data\TEMP\@Other\tinkerpop>git pull
Merge made by the 'recursive' strategy.
```
which will do a `git merge` behind the scenes. Your `git push` command
should have been:
```text
git push origin tp31 --force
```
The `--force` is required because you have no re-written the git history
for `tp31` (i.e. you moved your commit forward to the head of `tp31`) and the
server rejected it - "force" is a way of overriding that safeguard. So - anyway
- this could be fixed, but i'm not going to worry about it. If only two commits
come over in the merge (i.e. your original work and the merge commit) then I
suppose that this is fine to merge.
> Groovy project doesn't build on Windows
> ---------------------------------------
>
> Key: TINKERPOP-1493
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1493
> Project: TinkerPop
> Issue Type: Bug
> Components: groovy
> Affects Versions: 3.2.2
> Reporter: Paul Jackson
> Assignee: Jason Plurad
> Priority: Minor
>
> Builds on Windows fail for two reasons. First the line to create extTestDir
> is creating a path consisting of two full paths concatenated together. The
> second drive letter is seen as an illegal character:
> {code}private static final File extTestDir = new
> File(System.getProperty("user.dir"),
> TestHelper.makeTestDataDirectory(DependencyGrabberTest.class));{code}
> Second, when it comes time to delete the directory it is locked. This is
> because some instances of JarFile are created on it but not closed.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
