分支之间的Git引用冲突（无法更新本地分支） [英] Git reference conflicts between branches (unable to update local branch)

问题描述

在尝试 git fetch 远程分支时遇到以下错误：

错误： Ref ref / origin / remotes / my-branch位于 some-hash ，但预期 another-hash
来自github.com： my-repository
！ some-hash my-branch - > origin / my-branch（无法更新本地ref）

我不知道到底什么东西爆炸了。任何启示？

解决方案

我发现这个错误的原因：

有人创建了另一个同名的分支，但具有不同的大小写。

发生了什么？

Git for窗口不区分大小写。所以，事情变得疯狂了！ Git无法区分一个人，将每个人的头脑混为一谈。解决方案：

Just cut邪恶的根源。错误的远程分支已被删除，并且永远都不错。

I'm experiencing the following error while trying to git fetch a remote branch:

error: Ref refs/origin/remotes/my-branch is at some-hash but expected another-hash From github.com:my-repository ! some-hash my-branch -> origin/my-branch (unable to update local ref)

I have no idea what the hell just blew up. Any enlightenment?

解决方案

I've found this error's cause:

Someone has created another branch with the same name, but different case.

What happened?

Git for windows isn't case sensitive. So, things just got crazy! Git couldn't distinguish one from another, mistaking the hash of each's head.

Solution:

Just cut the evil by its root. Wrong remote branch was deleted and evererything is nice as ever.

这篇关于分支之间的Git引用冲突（无法更新本地分支）的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！