Error message:

Error when updating code:

Error merging
You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).
Please, commit your changes before you merge.

Cherry pick error

Cherry-pick Failed
f1c9ec4e [fix] xxxxxxx commit message xxxxxxxx
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git cherry-pick --skip'

Solution

git cherry-pick --abort
git pull

be careful:

In cherry pick, you need to ensure that there is no code to be submitted in the commit list