Error merging: fatal: You have not concluded your merge (MERGE_HEAD exists).

错误：Error merging: fatal: You have not concluded your merge (MERGE_HEAD exists).



解决方案1：保留你本地的修改(推荐)

git merge --abort

git reset --merge

合并后记得一定要提交这个本地的合并

然后在获取线上仓库

git pull



解决方案2：down下线上代码版本,抛弃本地的修改

git fetch --all

git reset --hard origin/master

git fetch

解决方案3：删除分支，重新clone