git的樱桃挑选错误：无法适用，Git的状态“通过我们删除：”

Question

我做如下

git cherry-pick 5eb68e3 

error: could not apply 5eb68e3... Switched timezone to IST 
hint: after resolving the conflicts, mark the corrected paths 
hint: with 'git add> <paths>' or 'git rm <paths>' 
hint: and commit the result with 'git > commit' 

root@master:~# git status 
On branch pandy 
You are currently cherry-picking commit 5eb68e3. 
    (fix conflicts and run "git cherry-pick --continue") 
    (use "git cherry-pick --abort" to cancel the cherry-pick operation) 

Unmerged paths: 
    (use "git add/rm <file>..." as appropriate to mark resolution) 

     deleted by us: init.yml 

no changes added to commit (use "git add" and/or "git commit -a") 

我试图git add init.yml和承诺，并试图git rm init.yml和承诺，但没有运气。

提交只有一行改变，但如果我做git添加init.yml，它会更改完整的文件。

Answer 1

想申请当面对这个问题提交到n和n+k我试图cherry-pick n..n+k这里居然是应该做的git cherry-pick n-1..n+k。