git error: You have not concluded your merge (MERGE_HEAD exists).fatal: Exiting because of unfinishe

IntelliJ中报错

error: You have not concluded your merge (MERGE_HEAD exists).
fatal: Exiting because of unfinished merge.

解决方法：

到代码所在文件夹，通过git命令行在所在分支上执行命令：

git merge --abort; 
git reset --hard;