在Git發生衝突的情況下提交更改時出現問題？

Question

推動時，我發生衝突。所以我把它拉了出來，並且糾正了我在當地的衝突。

Git拉和推不工作。

對於拉動下，錯誤是：

abc@xyz MINGW64 /e/Git project (master|MERGING) 
*git pull origin master* 
error: You have not concluded your merge (MERGE_HEAD exists). 
hint: Please, commit your changes before merging. 
fatal: Exiting because of unfinished merge. 

對於推，錯誤是：

! [rejected]  master -> master (non-fast-forward) 
error: failed to push some refs to center git repository 
hint: Updates were rejected because the tip of your current branch is behind 
hint: its remote counterpart. Integrate the remote changes (e.g. 
hint: 'git pull ...') before pushing again. 

Answer 1

我的第一個建議是驗證庫

git status 

然後做出是否決定您已解決衝突

git add files 
git commit 

現在，你可以把你的變化，但是這取決於你的情況，請仔細閱讀https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts