Question

在推动的同时，我遇到了冲突。所以我拉了它，并修复了我当地的冲突。

Git pull and push无效。

对于pull，错误是：

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

在提交更改时Git发生冲突时会出现问题？

1 个答案: