解决 git cherry-pick could not apply
当 git cherry-pick c096b573 出现以下报错时，是 api.js 文件代码有冲突，解决一下代码冲突然后 commit 就好了Auto-merging config/api.jsCONFLICT (content): Merge conflict in config/api.jserror: could not apply c096b57... 提交文字备注hint: afte
·
当 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'
瓜分20万奖金 获得内推名额 丰厚实物奖励 易参与易上手
更多推荐
0
0- 0
已为社区贡献1条内容
所有评论(0)