解决 git cherry-pick could not apply

当 git cherry-pick c096b573 出现以下报错时，是 api.js 文件代码有冲突，解决一下代码冲突然后 commit 就好了

 

Auto-merging config/api.js

CONFLICT (content): Merge conflict in config/api.js

error: could not apply c096b57... 提交文字备注

hint: after resolving the conflicts, mark the corrected paths

hint: with 'git add ' or 'git rm '

hint: and commit the result with 'git commit'