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-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列表中没有需要提交的代码


免责声明!

本站转载的文章为个人学习借鉴使用,本站对版权不负任何法律责任。如果侵犯了您的隐私权益,请联系本站邮箱yoyou2525@163.com删除。



 
粤ICP备18138465号  © 2018-2025 CODEPRJ.COM