[英]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.