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.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
