Hey,
I have a feature branch with two dozen commits which I merged into master
locally and now want to push directly to git. All commits have been
reviewed, so going via gerrit makes no sense. (In fact it complains about
the stuff already being closed it I try that.) When I try to do this, I get
the below message:
git push origin master
Counting objects: 102, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (80/80), done.
Writing objects: 100% (83/83), 36.01 KiB, done.
Total 83 (delta 49), reused 0 (delta 0)
remote: Resolving deltas: 100% (49/49)
remote: Processing changes: refs: 1, done
To ssh://review/mediawiki/extensions/SemanticMediaWiki.git
! [remote rejected] master -> master (can not update the reference as a
fast forward)
error: failed to push some refs to
'ssh://review/mediawiki/extensions/SemanticMediaWiki.git'
This is after I did a pull from origin master
git pull origin master
From
ssh://review/mediawiki/extensions/SemanticMediaWiki
* branch master
-> FETCH_HEAD
Already up-to-date.
Anyone know what's going on and how I can fix this?
(I have gerrit rights to directly push to this repo.)
Cheers
--
Jeroen De Dauw
http://www.bn2vs.com
Don't panic. Don't be evil.
--