Hi guys,

I am having trouble.  I tried to push some changes to a remote repo (gerrit 
in fact if it matters).  The push was rejected because "can not update 
reference as a fast forward":

$ git push origin 2.4.1-perf
...
! [remote rejected] 2.4.1-perf -> 2.4.1-perf (can not update the reference 
as a fast forward)
error: failed to push some refs to 'ssh://gerrit:29418.'

But then when I pull to try to update my code, it says that it is up to 
date.

$ git pull --rebase
Current branch 2.4.1-perf is up to date.


If it helps, the output from log:

$ git log --graph --oneline --all --decorate

* c5181c9 (HEAD, 2.4.1-perf) Changing to not reach out
* d39e279 (origin/2.4.1-perf, origin/2.4.1) Fix proxy
* df365d9 Fix logback date
| * ea7cd32 (origin/master, origin/HEAD) Failed requests 
| * c18be22 Add configuration
| * 01e4153 Change filename
| *   8d29a2d Merge branch 'master' of ssh://gerrit:29418/fetcher
| |\  
| | * 097e6e0 Update netty
| | * 0d17db9 Update to latest libraries
| | * ce6946c graceful shutdown
| * | f0c7076 More fixes
| * | 02ef29f Update libraries
| |/  
| * b0748e7 Cleanup and optimizations
| * 0a7b7ac Add  configuration
| * 7aa447f Add support for address. 
| * 6689ab5 Support for throttling.
| * 63e1882 Update version to 2.7.0
| * 4544fef [maven-release-plugin] prepare release parent-2.4.1
| * fede25e Add plugins to pom.xml
|/  
* af07c70 Refactor client
* f273e62 Add separate threadpool for clients

I found similar threads, but nothing that help, so your help is very much 
appreciated.

Thanks!

-- 


Reply via email to