更新的本地，但無法推動

我不能推，但我的地方已經被更新更新的本地，但無法推動

git pull origin develop 
already up-to-date

，同時推動

git push origin develop     
! [rejected]  develop -> develop (non-fast-forward) 
error: failed to push some refs to 'xxxxxxx' 
hint: Updates were rejected because a pushed branch tip is behind its  remote 
hint: counterpart. Check out this branch and integrate the remote changes 
hint: (e.g. 'git pull ...') before pushing again. 
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

這是怎麼回事？

編輯後添加：

git show-branch develop origin/develop : 


! [develop] Merge branch 'develop' of XXXXX into develop 
! [origin/develop] Merge branch 'develop' of XXXXX into feature/JavaSDK 
-- 
- [origin/develop] Merge branch 'develop' of XXXXX into feature/JavaSDK 
+ [origin/develop^2^2] [MPSC-2189] 
+ [origin/develop^2^2^] [MPSC-2189] 
+ [origin/develop^2^2~2] [MPSC-2189] location page 
+ [origin/develop^2~2] locations and service manager 
+ [origin/develop^2^2~4] [MPSC-2189] edit location page 
..... 
+ [origin/develop~35^2^] [MPSC-2177] 
-- [develop] Merge branch 'develop' of XXXXX into develop

來源

2015-05-25 sisimh

有你有看在兩個分支的提交與'git的展示 - 分支發展起源/發展？ – user1978011

我是新來的git im用於svn ,, @ user1978011你提到的命令給我列出了所有團隊成員完成的所有提交 – sisimh

好的，輸出是否足夠短以便你可以在這裏發佈它？這應該對我們很有幫助。 – user1978011

你做某種歷史重新寫的（如：變基，重命名提交信息等）？

如果是的話，如果你確信git log/gitk顯示正確提交，那麼你可以做一個被迫推：

git push -f origin develop

來源

2015-05-26 08:47:56

更新的本地，但無法推動

回答

相關問題