混帳推到遠程給快進錯誤

Question

我試圖部署到遠程服務器，這是我得到的錯誤 -

git push uat release/1.1:release 
To ubuntu@ubuntu-jvm:/repos/tms/uat 
! [rejected]  release/1.1 -> release (non-fast-forward) 
error: failed to push some refs to 'ubuntu@ubuntu-jvm:/repos/tms/uat' 
To prevent you from losing history, non-fast-forward updates were rejected 
Merge the remote changes (e.g. 'git pull') before pushing again. See the 
'Note about fast-forwards' section of 'git push --help' for details 

當我試圖從遠程這種拉動是我得到的錯誤：

git pull uat release:release/1.1 
remote: Counting objects: 58, done. 
remote: Compressing objects: 100% (33/33), done. 
remote: Total 35 (delta 17), reused 8 (delta 0) 
Unpacking objects: 100% (35/35), done. 
From ubuntu-jvm:/repos/tms/uat 
! [rejected]  release -> release/1.1 (non-fast-forward) 

我在遠程位置有一個裸git回購。

我該如何解決？

Answer 1

您的兩個存儲庫不同步。您將需要處理本地存儲庫上的任何合併衝突，然後再次推送。

git checkout release/1.1 
git fetch --all 
git merge origin/release 
# resolve conflicts 
git commit -av 
git push