You have not concluded your merge (MERGE_HEAD exists).
idea 右下分支名前有警告,在合并其他分支或者别的操作时git提示错误:You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you merge.
应该是在合并分支没有解决冲突结束合并导致。
Git->Merge 选择继续合并或者结束合并即可
如果没有分支问题Merge是没有这两个选项的