git cherry-pick conflict:
just do like this:
1.git status
2.find the files which are both modified.
3.edit and solve the conflict one file by one file.
4.git add the files you have just modified in step 3.
5.git cherry-pick –continue//注意是 两个-
OK. Make it!
相关文章：