我在当地有一家全新的分公司,我想挑选一些客户。一些选秀结果还行,但下一个选秀产生了冲突:
>git cherry-pick 676b371
error: could not apply 676b371... fixed connection resolution.
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'
>git status
On branch MyBranch
fatal: Could not open file .git/rebase-merge/done for reading: No such file or directory
这是什么意思?我的回购协议失效了?我该如何解决这个问题?
按建议运行:
>git cherry-pick --abort
>git status
On branch MyBranch
fatal: Could not open file .git/rebase-merge/done for reading: No such file or directory
这是.git/rebase合并文件夹的内容:
git-rebase-todo
git-rebase-todo.backup
head-name
interactive
onto
orig-head
quiet
附笔
git版本2.10.1.windows.1
