fatal: You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists). Please, commit your changes before you merge. 你还没有完成你的cherry pick 解决 放弃提交即可 git cherry-pick --abort