cherry-pick的时候怎么出现这个错误

Discuss / Git / cherry-pick的时候怎么出现这个错误

Back

Topic source

#1 Created at ... [Delete] [Delete and Lock User]

我回到dev分支，cherry-pick的时候怎么出现这个错误？提示我有冲突，那肯定有冲突啊，

$ git cherry-pick 31bf54d

Auto-merging README.md

CONFLICT (content): Merge conflict in README.md

error: could not apply 31bf54d... fix bug101

hint: after resolving the conflicts, mark the corrected paths

hint: with 'git add <paths>' or 'git rm <paths>'

hint: and commit the result with 'git commit'

#2 Created at ... [Delete] [Delete and Lock User]

你在dev分支 cherry-pick 的时候，之前做的修改要先commit。或者你用 vi 打开修改的这个文件看是不是冲突了，解决冲突再add commit 试试。