git推送错误，同时上传

Question

有没有人看到这个错误之前，做一个git推？任何提示调试或克服恐怖？

mkdir opensource && cd opensource 
git clone git://git.qinc.com/platform/vendor/q-opensource/wcn/prime.git 
cd prime 
git checkout -b jb_2.5 origin/jb_2.5 
git cherry-pick -x ..7174961054435d3ae9d233c81227b0715cfc1715 
git push ssh://review-android.qinc.com:29418/platform/vendor/q-opensource/wcn/prime.git jb_2.5:refs/for/jb_2.5 

test@wcn-linux5:/local/mnt2/workspace2/test/LA_builds/opensource_JB2.5/prime$ git push ssh://review-android.qinc.com:29418/platform/vendor/q-opensource/wlan/prime.git jb_2.5:refs/for/jb_2.5 
Enter passphrase for key '/usr2/test/.ssh/id_rsa': 
Counting objects: 662, done. 
Delta compression using up to 8 threads. 
Compressing objects: 100% (100/100), done. 
Writing objects: 100% (148/148), 534.35 KiB, done. 
Total 148 (delta 88), reused 97 (delta 47) 
remote: Resolving deltas: 100% (88/88) 
remote: Processing changes: refs: 1, done 
remote: (W) be1d372: no files changed, was rebased 
To ssh://review-android.qinc.com:29418/platform/vendor/q-opensource/wlan/prime.git 
! [remote rejected] jb_2.5 -> refs/for/jb_2.5 (no changes made) 
error: failed to push some refs to 'ssh://review-android.qinc.com:29418/platform/vendor/q-opensource/wlan/prime.git' 

Answer 1

看起来像是有人承诺，推动，重新发起，承诺，然后推动重写历史。

布赖恩·坎贝尔回答的症状：Git non-fast-forward rejected

我相信你正在运行到的是，有人在回购改写了历史。不是一个伟大的情况，你有拉？您可能需要克隆repo的新副本，因为您的历史记录不再符合服务器的历史记录并再次进行更改。