合併分支後無法推送到Git存儲庫

Question

我正在使用Git存儲庫，我有我的分支（稱爲jviotti），我的更改已合併到Master中。 現在，在做出一些更改後，我發現自己無法推送到我的分支。

$ git push origin jviotti 
To https://github.com/jorisbontje/pikapay-frontend.git 
! [rejected]  jviotti -> jviotti (non-fast-forward) 
error: failed to push some refs to 'https://github.com/jorisbontje/pikapay-frontend.git' 
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：

$ git pull 
You asked me to pull without telling me which branch you 
want to rebase against, and 'branch.jviotti.merge' in 
your configuration file does not tell me, either. Please 
specify which branch you want to use on the command line and 
try again (e.g. 'git pull <repository> <refspec>'). 
See git-pull(1) for details. 

If you often rebase against the same branch, you may want to 
use something like the following in your configuration file: 

    [branch "jviotti"] 
    remote = <nickname> 
    merge = <remote-ref> 
    rebase = true 

    [remote "<nickname>"] 
    url = <url> 
    fetch = <refspec> 

See git-config(1) for details. 

在所以在這裏瀏覽類似的問題後，我想：

$ git pull origin master:jviotti 
From https://github.com/jorisbontje/pikapay-frontend 
! [rejected]  master  -> jviotti (non-fast-forward) 

我認爲這會做的伎倆。我錯過了什麼？

Answer 1

你應該首先確保你的本地分支有上游分支有它的上游。

git branch --set-upstream-to jviotti origin/jviotti 
# or 
git branch -u jviotti origin/jviotti 

那是因爲新的默認push policy will be "simple"。

一旦做到這一點：

git pull --rebase origin jviotti 

，可以重播在origin/jviotti頂部你主人的歷史（如 「What does it mean when git pull causes a conflict but git pull --rebase doesn't?」）。

但在那之後，在 「git pull --rebase upstream & git push origin rejects non-fast-forward?」，你可能仍然需要一個：

git push --force origin jviotti 

---

另一種選擇是可以重置本地回購，作爲OP jviotticomments：

我剛剛克隆了回購，更改分支和它很好。
Awfull git惡夢，一切都好了。