2020-12-03

git 提交错误

error: Committing is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

翻译：
错误:由于文件未合并，无法提交。
提示:在工作树中修复它们，然后使用“git add/rm <file>”
提示:适当标记分辨率并作出承诺。
致命:因未解决的冲突而退出。

! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to ‘https://gitee.com/gitee-yanzu/project.git’
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.
hint: See the ‘Note about fast-forwards’ in ‘git push --help’ for details.

翻译
![拒绝]主→主(non-fast-forward)
错误:未能将一些参考信息推送到“https://gitee.com/gitee-yanzu/project.git”
提示:更新被拒绝是因为当前分支的尖端在后面
提示:它的远程对等物。集成远程更改(例如。
提示:“git拉…”)，然后再推。
提示:详细信息请参见“git push—help”中的“关于快进的说明”。

• 总结： 出现错误原因：文件未合并，无法提交 应该先pull 根据下图 选择自己所需要的版本