Cherry-pick Failed Error merging 。You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists). Please, commit your changes before you merge.
报错信息： 更新代码时报错： Error merging You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists). Please, commit your changes before you merge. Cherry-p
