Git 错误解决和解析 - error: path ‘xxx‘ is unmerged