1. Git 解决 git cherry-pick could not apply

当git cherry-pick 出现
error: could not apply 3e86ed8… Added Copy Patron button to circ-toolbar
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ’ or 'git rm ’
hint: and commit the result with ‘git commit -c 3e86ed8’

时。 我们可以

git status

而后

git add
最后
git commit -c 3e86ed8