You have unmerged files.
- 根据 Git 命令行报错信息修改相关冲突文件，然后 commit
commit your changes before you can merge.
- 取消 commit
git merge --abort
git reset --merge
- 解决冲突文件
- 重新 add
push error: failed to push some refs to ‘’
- commit 之前先
git pull
This topic created in 3470 days ago, the information mentioned may be changed or developed.
No Comments Yet
Select Language