从git 一个分支cherry-pick apk 到另外一个分支!
1.找到原分支的hash值
在原分支下面执行
git log --oneline
b35b237c9f4
2.在新分支上执行
git cherry-pick b35b237c9f4
error: could not apply b35b237c9f4… 修复缺陷
hint: After resolving the conflicts, mark them with
hint: “git add/rm ”, then run
hint: “git c…