首先,我试图撤消拉(不要问我为什么),由我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