github常用命令

github的windows系统下的命令行工具: git for windows

主页地址: https://git-for-windows.github.io/

一. 在执行git commit命令时, 报了以下错误:

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

解决方案:

$ git reset --hard FETCH_HEAD

二. 查看当前git的状态

$ git status