无法锁定ref 'refs/remotes/origin/master‘

Question

当我第一次执行git pull时，如果有一些更新，我总是会得到cannot lock ref 'refs/remotes/origin/master'。

完整的控制台日志如下。

D:\code\react-native\expo-multi-screen-starter>git pull
error: cannot lock ref 'refs/remotes/origin/master': is at b2459b4d5af42622cba55f9fe47ccd14fbd879bc but expected 76f11048c866cfe3e6570eaacf90db3cb7732723
From github.com:liudonghua123/expo-multi-screen-starter
 ! 76f1104..b2459b4  master     -> origin/master  (unable to update local ref)

D:\code\react-native\expo-multi-screen-starter>git pull
 App.js                                          | 19 ++++-----
 src/navigation/AuthStack.js                     | 14 +++++++
 src/navigation/RootNavigator.js                 | 22 ++++++++++
 src/navigation/TabNavigator.js                  |  4 +-
 src/screens/AuthLoadingScreen.js                | 35 ++++++++++++++++
 src/screens/HomeScreen.js                       | 19 +++++++++
 src/screens/{LoginScreen.js => SignInScreen.js} | 54 ++++++++++++++++++++++---
 7 files changed, 147 insertions(+), 20 deletions(-)
 create mode 100644 src/navigation/AuthStack.js
 create mode 100644 src/navigation/RootNavigator.js
 create mode 100644 src/screens/AuthLoadingScreen.js
 rename src/screens/{LoginScreen.js => SignInScreen.js} (61%)

D:\code\react-native\expo-multi-screen-starter>

Answer 1

您需要在Git bash上使用以下Git命令更新引用：

$ git update-ref -d refs/remotes/origin/[locked branch name]

然后使用$git pull拉取

[locked branch name]是由于提交Ids不匹配而发生错误的分支的名称。

Answer 2

我的错误看起来有点不同：

错误:无法锁定ref 'refs/remotes/origin/releases/branch1'：'refs/remotes/origin/ releases‘存在；无法创建'refs/remotes/origin/releases/branch1’

好了！新分支发布/分支1 ->源/发布/分支1(更新本地链接失败)。

执行以下命令后，错误消失：

git remote prune origin

顺便说一句，TortoiseGit建议她这么做。但这是

git update-ref -d refs/remotes/origin/releases/branch1

命令没有帮助。

Answer 3

git remote prune origin

这个命令对我很有效。