首先,我試圖撤消拉(不要問我爲什麼),由我origin/develop
分支移動到特定的承諾:如何修復有兩個同名原始分支的git?
git reset --hard <older-commit>
# trying to undo the pull (please don't ask why)
git branch -f origin/develop HEAD
貌似混帳創建新的本地分支稱爲origin/develop
:
git log -n 3 --decorate remotes/origin/develop
commit 43187d461a5e2b3a4a3443ac7d91d2414f6ccdd7 (origin/develop)
Author: me <[email protected]>
Date: Tue Oct 13 17:10:29 2015 -0700
Commit 3
commit 33187d461a5e2b3a4a3443ac7d91d2414f6ccdd6
Author: me <[email protected]>
Date: Tue Oct 13 17:01:29 2015 -0700
Commit 2
commit 23187d461a5e2b3a4a3443ac7d91d2414f6ccdd5 (HEAD, develop, origin/develop)
Author: me <[email protected]>
Date: Tue Oct 13 17:00:29 2015 -0700
Commit 1
兩個問題:
- 你能解釋一下爲什麼會發生?
- 我該如何解決這個問題,而不會進一步搞亂事情?
當你在git命令上使用'-f'(強制)選項時,你可能會冒險將存儲庫置於無效狀態,這似乎已經發生了。將43187d46克隆到新目錄中,然後重試。 – msw