intellij idea: git: You have not concluded your merge (MERGE_HEAD exists)

git: You have not concluded your merge (MERGE_HEAD exists)

可以直接用线上最新版本覆盖到本地[注意本地版本做好备份]

git fetch --all
git reset --hard origin/master
git fetch

---

Reference
https://blog.youkuaiyun.com/xlgen157387/article/details/51146949