Git 异常解决

1.异常1 [ 无法 PULL 拉取代码 ]

    Can't checkout because of unmerged files
    You have to resolve all merge conflicts before checkout.
    After resolving conflicts you also probably would want to commit your files to the current branch.

方案：可以先尝试执行该命令：git reset --hard FETCH_HEAD  如果不能解决再寻求其他方案；