git报错You have not concluded your merge

git merge --abort aborts merge

git reset --merge re-merge

Guess you like

Origin blog.csdn.net/jyf_568/article/details/133921415