I'm trying to push some changes to SOLR-17744 and running into a weird
glitch on branch_9x...
gitbox seems to be rejecting my commits because there are newer
commits on github?
To be clear: my local repo is up to date with gitbox.apache.org -- it's
gitbox and github that seem to disagree.
- Has anyone else seen this before?
- any suggestions on resolving?
- i assume my next step is an INFRA ticket?
hossman@slate:~/lucene/solr [j17] [+branch_9x] $ git push
Counting objects: 30, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (25/25), done.
Writing objects: 100% (30/30), 7.10 KiB | 7.10 MiB/s, done.
Total 30 (delta 16), reused 0 (delta 0)
remote: To github:apache/solr.git
remote: ! [rejected] 380c5a76e53e82a6cebc6217a4acae6623999a27
-> branch_9x (fetch first)
remote: error: failed to push some refs to 'github:apache/solr.git'
remote: hint: Updates were rejected because the remote contains work that you
do not
remote: hint: have locally. This is usually caused by another repository
pushing to
remote: hint: the same ref. If you want to integrate the remote changes, use
remote: hint: 'git pull' before pushing again.
remote: hint: See the 'Note about fast-forwards' in 'git push --help' for
details.
remote: Syncing refs/heads/branch_9x...
remote: Could not sync with GitHub:
remote: Error running update hook:
/x1/gitbox/hooks/update.d/01-sync-repo.py
remote: error: hook declined to update refs/heads/branch_9x
To https://gitbox.apache.org/repos/asf/solr.git
! [remote rejected] branch_9x -> branch_9x (hook declined)
error: failed to push some refs to
'https://gitbox.apache.org/repos/asf/solr.git'
-Hoss
http://www.lucidworks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@solr.apache.org
For additional commands, e-mail: dev-h...@solr.apache.org
