报错信息：

更新代码时报错：

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

Cherry-pick报错

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'

解决方案

// 执行一下命放弃cherry-pick
git cherry-pick --abort
// 然后重新拉取代码
git pull

注意：

cherry-pick时需要保证commit列表中没有需要提交的代码