我跑到下面的命令,因为我想将我的分公司生产回,而无需先签:refname是模糊的,拉失败
git branch -f production HEAD~1
现在我得到以下警告,当我结帐生产:
warning: refname 'production' is ambiguous.
我然后运行:
git pull
我收到以下错误:
First, rewinding head to replay your work on top of it...
Fast-forwarded production to 7463e01c536ad52746b8879ef3d70ffd5a8db31e.
error: Ref refs/heads/production is at 252038dfa22caba8a816a68dcb005c625e44c51f but expected ae5b621609c1b5b430e3d30711157298f842942a
fatal: Cannot lock the ref 'refs/heads/production'
Could not move back to refs/heads/production
虽然我可以拉其他分支。我怎样才能解决这个问题?
更多信息
git tag
不返回任何输出。我以前有一个生产资源库,但现在我已重新命名,住
> ~/repo (chris-membership-fees)$ git show-ref | grep production
88e0c37c9ae4ff6967ddd027b62b62fa2c0ac272 refs/heads/production
9d739cff44a898f0c68da33fb22a230985e479ce refs/remotes/backup/production
~/repo (chris-membership-fees)$ git branch -a | grep production
production
remotes/backup/production
登录
我所标记的第一次修订的,第二个作为B(注意,版本号已经改变因为现在生产不同)。这是日志,通过装饰
* commit 7463e01c536ad52746b8879ef3d70ffd5a8db31e (**tag: a**, backup/live-master, production, live-master)
|
| Date: Wed Dec 28 11:47:49 2011 +1100
|
| Merge remote-tracking branch 'origin/joseph-quick-fix'
|
* commit f35f0259c4e36d46dd1df71b3293bef6105cef98 (origin/hotfix-googleplusdirectconnect)
|
| Date: Fri Dec 23 12:25:27 2011 +1100
|
| Add google plus link tag to home page for direct connect
|
* commit 8b3a30ef2909439ac18b65ebbb316eb0cdd2d61c
|\ Merge: f696f3e 88e0c37
| |
| | Date: Wed Dec 21 14:28:45 2011 +1100
| |
| | Merge branch 'master' into chris-hotfix
| |
* | commit f696f3e2b8f4a19ec2b2c2a3638c68e7a52836e3 (origin/chris-hotfix, backup/chris-hotfix, chris-hotfix)
| |
| | Date: Wed Dec 21 11:56:10 2011 +1100
| |
| | Fixed buyer price info
| |
| * commit 88e0c37c9ae4ff6967ddd027b62b62fa2c0ac272
| |\ Merge: c9655da ae5b621
| |/
|/| Date: Wed Dec 21 11:53:36 2011 +1100
| |
| | Merge branch 'master' of git.freelancer.com:production into production
| |
* | commit ae5b621609c1b5b430e3d30711157298f842942a (HEAD, **tag: b**)
| |
| | Date: Wed Dec 21 10:51:47 2011 +1100
| |
| | Merge branch 'master' of git.freelancer.com:production
| |
| * commit c9655da9c1627ab53720ae818affdd1e6f14119f (origin/game-shadow2)
| |
| | Date: Tue Dec 20 18:41:57 2011 -0500
| |
| | * Removed debugging code
| |
| * commit ca88d33538bd3b99ea7c186b5b531e611847989d
| |\ Merge: 99e983a c397a8b
| |/
|/| Date: Tue Dec 20 17:25:24 2011 -0500
| |
| | Merge remote-tracking branch 'production/master' into shadow2
'git branch -a'的输出是什么? – 2011-12-21 01:30:48
你也可以使用'git show-ref'来显示所有未缩写的ref。 – 2011-12-21 01:36:09
您使用的是哪个版本的git? – 2011-12-21 08:17:40