[英]I merged a commit into master and am now getting a message about cherry-picking. Would appreciate advise on what is safe to do
这是我的GitHub文件的状态:
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 41a0584.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Untracked files:
(use "git add <file>..." to include in what will be committed)
Ja/Ja.sln
没有添加任何内容提交但存在未跟踪的文件(使用“ git add”进行跟踪)
我意识到这暗示了我应该怎么做,但是有人可以解释它的意思,以及如果我运行中止选项时如何找出可能损失的东西?
git并不建议您选择“领料”,而是告诉您目前正在进行“领料”并且未完成 。
基本上,要退出此状态并恢复正常,您可以中止它或通过commit结束它:
# to get back to the state before cherry-picking
git cherry-pick --abort
--abort
将使您的分支恢复到刚开始采摘樱桃之前的位置。
或者,如果您确实希望保留由上述提交41a0584
带来的这些最新更改,
# check that you don't have remaining conflicts
git status
# here, resolve any potential conflicts and check if everything is fine
# when you're happy with the current state, as git hints in the output
git cherry-pick --continue
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.