blocks|key|220369|text|如果你在一个不区分大小写的文件系统(Windows或OS+X)下运行git，如果有两个分支同名但大小写不同，例如user_model_changes和User_model_changes，就会发生这种情况，因为两个远程分支都会匹配相同的跟踪引用。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|220370|删除错误的远程分支(不应该只有大小写不同的分支)，然后使用git+remote+prune+origin，一切都应该正常工作|220371|entityMap^0|1K|I|23|I|0|T|N|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|R|8|@]|D|@]|E|$]]]|I|$]]

If you are running git under a file system that is not case sensitive (Windows or OS X) this will occur if there are two branches with the same name but different capitalisation, e.g. <code>user_model_changes</code> and <code>User_model_changes</code> as both of the remote branches will match the same tracking ref.

Delete the wrong remote branch (you shouldn't have branches that differ only by case) and then <code>git remote prune origin</code> and everything should work

blocks|key|218216|text|永久修复|type|unstyled|depth|inlineStyleRanges|entityRanges|data|218217|git+update-ref+-d解决了此错误的实例，例如|offset|length|style|CODE|218218|git+update-ref+-d+refs/remotes/origin/user|code-block|syntax|javascript|218219|请注意，这不会影响远程。|218220|在我的例子中，后续的git+fetch再次获取了该分支，并且随后的git获取/提取不再给出错误"remote+ref+is+at+at“。|218221|如果这不起作用，一个临时解决方案：|218222|还请注意，如果您不关心有问题的分支(例如，您只想更新主分支，而不是源/用户)，则git+pull解决方案是获取然后合并您关心的特定分支，例如|218223|git+fetch+#+may+give+an+error+for+a+particular+branch,+but+other+branches+will+still+be+successfully+fetched
git+merge+origin/master|218224|entityMap^0|0|0|H|0|0|0|A|9|0|0|14|8|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Z|8|@$D|10|E|11|F|G]]|9|@]|A|$]]|$1|H|3|I|5|J|7|12|8|@]|9|@]|A|$K|L]]|$1|M|3|N|5|6|7|13|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|14|8|@$D|15|E|16|F|G]]|9|@]|A|$]]|$1|Q|3|R|5|6|7|17|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|18|8|@$D|19|E|1A|F|G]]|9|@]|A|$]]|$1|U|3|V|5|J|7|1B|8|@]|9|@]|A|$K|L]]|$1|W|3|-4|5|6|7|1C|8|@]|9|@]|A|$]]]|X|$]]

<h1>Permanent Fix</h1>

<code>git update-ref -d</code> resolved my instance of this error, e.g.

<pre><code>git update-ref -d refs/remotes/origin/user
</code></pre>

Note that this doesn't impact remote.

In my case, a subsequent <code>git fetch</code> fetched that branch again, and following git fetches/pulls no longer gave the error "remote ref is at but expected".

<h1>If that doesn't work, a temporary fix:</h1>

Note also that if you don't care about the branch in question (e.g. you just want to update master, not origin/user), a <code>git pull</code> workaround is to fetch then just merge the particular branch you care about, e.g.

<pre><code>git fetch # may give an error for a particular branch, but other branches will still be successfully fetched
git merge origin/master
</code></pre>

blocks|key|2865872|text|只要删除\.git\refs\remotes\origin下的文件夹和文件即可。当你没有未推送的更改时，它会起作用。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2865873|entityMap^0|4|P|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

Just delete the folders and files under <code>\.git\refs\remotes\origin</code>.
Works, when u don't have unpushed changes.

blocks|key|3079425|text|逐个使用下面的两个命令。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3079426|git+gc+--prune=now

git+remote+prune+origin|code-block|syntax|javascript|3079427|这将解决您的问题。|3079428|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

Use the below two commands one by one.

<pre><code>git gc --prune=now

git remote prune origin
</code></pre>

This will resolve your issue.

blocks|key|220532|text|我运行这个来解决这个问题：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|220533|git+gc+--prune=now|code-block|syntax|javascript|220534|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

I ran this to solve the problem:

<pre><code>git gc --prune=now
</code></pre>

blocks|key|215473|text|我必须从我的命令行中删除分支：|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|215474|.git\refs\remotes\{my+remote}\{**my+branch**}|code-block|syntax|javascript|215475|然后手动执行以下操作：|215476|git+pull+[remote_name]+[branch_name]|215477|我能够拉出这些变化。|215478|注意:我使用的是SourceTree，无法执行拉取操作。|215479|entityMap^0|C|2|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@$9|V|A|W|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|X|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|Y|8|@]|D|@]|E|$]]|$1|M|3|N|5|H|7|Z|8|@]|D|@]|E|$I|J]]|$1|O|3|P|5|6|7|10|8|@]|D|@]|E|$]]|$1|Q|3|R|5|6|7|11|8|@]|D|@]|E|$]]|$1|S|3|-4|5|6|7|12|8|@]|D|@]|E|$]]]|T|$]]

I had to remove my branch from my command line at:

<pre><code>.git\refs\remotes\{my remote}\{**my branch**}
</code></pre>

and then manually doing:

<pre><code>git pull [remote_name] [branch_name]
</code></pre>

I was able to pull the changes. 

Note: I was using SourceTree and was unable to do the pull.

blocks|key|2865944|text|硬重置也可以解决这个问题|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2865945|git+reset+--hard+origin/master|code-block|syntax|javascript|2865946|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

A hard reset will also resolve the problem

<pre><code>git reset --hard origin/master
</code></pre>

blocks|key|3079312|text|Clearer+|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|3079313|终端中的|3079314|ordered-list-item|3079315|3079316|cd+/.git/refs/remotes/origin|3079317|do+ls，您将看到一些分支和cd分支您认为有问题的分支|unordered-list-item|CODE|3079318|3079319|rm+branchname|3079320|If不起作用，请删除所有branches/HEAD|3079321|3079322|-+you+may+wana+pull|code-block|syntax|javascript|3079323|​|3079324|希望它现在起作用了。|3079325|entityMap^0|0|8|0|0|0|0|0|3|2|H|B|0|0|0|D|0|0|P|0|0|0|0|1|0|0|A|0^^$0|@$1|2|3|4|5|6|7|17|8|@$9|18|A|19|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|1A|8|@]|D|@]|E|$]]|$1|H|3|-4|5|I|7|1B|8|@]|D|@]|E|$]]|$1|J|3|-4|5|6|7|1C|8|@]|D|@]|E|$]]|$1|K|3|L|5|6|7|1D|8|@]|D|@]|E|$]]|$1|M|3|N|5|O|7|1E|8|@$9|1F|A|1G|B|P]|$9|1H|A|1I|B|C]]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|1J|8|@]|D|@]|E|$]]|$1|R|3|S|5|6|7|1K|8|@$9|1L|A|1M|B|C]]|D|@]|E|$]]|$1|T|3|U|5|O|7|1N|8|@$9|1O|A|1P|B|C]]|D|@]|E|$]]|$1|V|3|-4|5|6|7|1Q|8|@]|D|@]|E|$]]|$1|W|3|X|5|Y|7|1R|8|@]|D|@]|E|$Z|10]]|$1|11|3|12|5|6|7|1S|8|@$9|1T|A|1U|B|C]]|D|@]|E|$]]|$1|13|3|14|5|6|7|1V|8|@$9|1W|A|1X|B|C]]|D|@]|E|$]]|$1|15|3|-4|5|6|7|1Y|8|@]|D|@]|E|$]]]|16|$]]

Clearer Steps

<ol>
<li>in terminal

<pre><code>cd /.git/refs/remotes/origin
</code></pre></li>
<li>do <code>ls</code>, you will see some branches and HEAD</li>
<li>Remove the branch you think has the problem

<pre><code>rm branchname
</code></pre></li>
<li>If it did not work, delete all branches/HEAD

<ul>
<li>you may wana pull</li>
</ul></li>
</ol>

Hope it works now.

blocks|key|3079514|text|不幸的是，像prune和reset或push这样的GIT命令对我不起作用。修剪工作过一次，然后问题又出现了。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3079515|对我有效的永久解决方案是手动编辑git文件。只需转到项目的.git文件夹，然后在Notepad%2B%2B等文本编辑器中打开文件packed+refs。然后导航到出现故障的分支所在的行，并将其guid更新为预期的guid。|3079516|如果您收到如下消息：|3079517|3079518|错误:无法锁定ref+'refs/remotes/origin/feature/branch_xxx'：位于425ea23facf96f51f412441f41ad488fc098cf23，但应为383de86fed394ff1a1aeefc4a522d886adcecd79|blockquote|3079519|3079520|3079521|然后在文件中找到包含refs/remotes/origin/feature/branch_xxx的行。guid将是预期的(第二个)guid-+383de86fed394ff1a1aeefc4a522d886adcecd79。您需要将其更改为真正的(第1个)+425ea23facf96f51f412441f41ad488fc098cf23。|offset|length|style|CODE|3079522|对其他失败的分支重复上述步骤，您就可以继续执行了。有时，在重新获取之后，我不得不对我之前已经“修复”的相同分支重复操作。在重新获取时，GIT会更新guids并提供最新的guids。|3079523|无论如何，这个问题并不是一个阻碍。分支列表将更新。这更像是一个警告。|3079524|entityMap^0|0|0|0|0|0|0|0|A|12|1Z|14|3L|14|0|0|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Y|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|Z|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|10|8|@]|9|@]|A|$]]|$1|G|3|H|5|I|7|11|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|12|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|13|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|14|8|@$N|15|O|16|P|Q]|$N|17|O|18|P|Q]|$N|19|O|1A|P|Q]]|9|@]|A|$]]|$1|R|3|S|5|6|7|1B|8|@]|9|@]|A|$]]|$1|T|3|U|5|6|7|1C|8|@]|9|@]|A|$]]|$1|V|3|-4|5|6|7|1D|8|@]|9|@]|A|$]]]|W|$]]

Unfortunately GIT commands like prune and reset or push didn't work for me. Prune worked once and then the issue returned.
The permanent solution which worked for me is to edit a git file manually. Just go to the project's .git folder and then open the file packed-refs in a text editor like Notepad++. Then navigate to the row with the failing branch and update its guid to the expected one.
If you have a message like:
<blockquote>
error: cannot lock ref 'refs/remotes/origin/feature/branch_xxx': is at 425ea23facf96f51f412441f41ad488fc098cf23 but expected 383de86fed394ff1a1aeefc4a522d886adcecd79
</blockquote>
then in the file find the row with <code>refs/remotes/origin/feature/branch_xxx</code>. The guid there will be the expected (2nd) one - <code>383de86fed394ff1a1aeefc4a522d886adcecd79</code>. You need to change it to the real (1st) one - <code>425ea23facf96f51f412441f41ad488fc098cf23</code>.
Repeat for the other failing branches and you'll be good to proceed. Sometimes after re-fetch I had to repeat for the same branches which i already 'fixed' earlier. On re-fetch GIT updates guids and gives you the latest one.
Anyways the issue isn't a show stopper. The branch list gets updated. This is rather a warning.

blocks|key|2865971|text|试试这个，它对我很有效。在您的终端中：git+remote+prune+origin。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2865972|entityMap^0|J|N|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

Try this, it worked for me.
In your terminal: <code>git remote prune origin</code>.

blocks|key|3079380|text|git+for-each-ref+--format='delete+%25(refname)‘refs/原始%7C+git+update-ref+--stdin+git+reflog+expire+--expire=now+--all+git+gc+--prune=now|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3079381|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

git for-each-ref --format='delete %(refname)' refs/original | git update-ref --stdin
git reflog expire --expire=now --all
git gc --prune=now

blocks|key|215550|text|我遇到了同样的问题，这是因为我重置为较旧的提交，尽管我已经推送到远程分支。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|215551|我通过删除本地分支，签出原始分支git+checkout+origin/my_branch，然后执行git+checkout+my_branch解决了这个问题|offset|length|style|CODE|215552|entityMap^0|0|G|T|1E|M|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@$D|L|E|M|F|G]|$D|N|E|O|F|G]]|9|@]|A|$]]|$1|H|3|-4|5|6|7|P|8|@]|9|@]|A|$]]]|I|$]]

I had the same problem which was caused because I resetted to an older commit even though I already pushed to the remote branch.

I solved it by deleting my local branch then checking out the origin branch <code>git checkout origin/my_branch</code> and then executing <code>git checkout my_branch</code>

blocks|key|220415|text|同样的情况，但是没有任何关于发布的评论。在我的例子中是正确的，我只有一个分支(master)并且只使用Unix文件系统，当我运行git+fetch+--progress+--prune+origin+and+branch+is+ahead+or+'origin/master‘时，这个错误随机发生。没有人可以提交，只有1个用户可以推送。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|220416|注意:我在acme库中有一个子模块，acme有新的子模块更改(新的提交)，我需要首先用git子模块更新做一个子模块更新。|220417|[2014-07-29+13:58:37]+Payload+POST+received+from+Bitbucket
[2014-07-29+13:58:37]+Exec:+cd+/var/www/html/acme
---------------------
[2014-07-29+13:58:37]+Updating+Git+code+for+all+branches
[2014-07-29+13:58:37]+Exec:+/usr/bin/git+checkout+--force+master
[2014-07-29+13:58:37]+Your+branch+is+ahead+of+'origin/master'+by+1+commit.
[2014-07-29+13:58:37]+++(use+"git+push"+to+publish+your+local+commits)
[2014-07-29+13:58:37]+Command+returned+some+errors:
[2014-07-29+13:58:37]+Already+on+'master'
---------------------
[2014-07-29+13:58:37]+Exec:+/usr/bin/git+fetch+--progress+--prune+origin
[2014-07-29+13:58:39]+Command+returned+some+errors:
[2014-07-29+13:58:39]+error:+Ref+refs/remotes/origin/master+is+at+8213a9906828322a3428f921381bd87f42ec7e2f+but+expected+c8f9c00551dcd0b9386cd9123607843179981c91
[2014-07-29+13:58:39]+From+bitbucket.org:acme/acme
[2014-07-29+13:58:39]++!+c8f9c00..8213a99++master+++++->+origin/master++(unable+to+update+local+ref)
---------------------
[2014-07-29+13:58:39]+Unable+to+fetch+Git+data|code-block|syntax|javascript|220418|要解决这个问题(在我的例子中)，如果您的分支在原始分支之前，只需运行第一个git+push即可。|220419|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|O|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|P|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

Same case here, but nothing about comments posted it's right in my case, I have only one branch (master) and only use Unix file system, this error occur randomly when I run git fetch --progress --prune origin and branch is ahead or 'origin/master'. Nobody can commit, only 1 user can do push.

NOTE: I have a submodule in acme repository, and acme have new submodule changes (new commits), I need first do a submodule update with git submodule update.

<pre><code>[2014-07-29 13:58:37] Payload POST received from Bitbucket
[2014-07-29 13:58:37] Exec: cd /var/www/html/acme
---------------------
[2014-07-29 13:58:37] Updating Git code for all branches
[2014-07-29 13:58:37] Exec: /usr/bin/git checkout --force master
[2014-07-29 13:58:37] Your branch is ahead of 'origin/master' by 1 commit.
[2014-07-29 13:58:37] (use "git push" to publish your local commits)
[2014-07-29 13:58:37] Command returned some errors:
[2014-07-29 13:58:37] Already on 'master'
---------------------
[2014-07-29 13:58:37] Exec: /usr/bin/git fetch --progress --prune origin
[2014-07-29 13:58:39] Command returned some errors:
[2014-07-29 13:58:39] error: Ref refs/remotes/origin/master is at 8213a9906828322a3428f921381bd87f42ec7e2f but expected c8f9c00551dcd0b9386cd9123607843179981c91
[2014-07-29 13:58:39] From bitbucket.org:acme/acme
[2014-07-29 13:58:39] ! c8f9c00..8213a99 master -&gt; origin/master (unable to update local ref)
---------------------
[2014-07-29 13:58:39] Unable to fetch Git data
</code></pre>

To solve this problem (in my case) simply run first git push if your branch is ahead of origin.

blocks|key|3079436|text|我知道这很老，但我有我自己的办法。因为我使用的是源树，所以发生这个错误是因为有人创建了一个新的分支。源代码树对此感到困惑。在我按下“远程分支拉取”组合框旁边的“刷新”按钮后，似乎sourcetree已经更新了分支列表，现在我可以成功拉取了。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3079437|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I know this is old, but I have my own fix. Because I'm using source tree, this error happens because someone create a new branch. The source tree is confused about this. After I press "Refresh" button beside the "remote branch to pull" combobox, it seems that sourcetree has updated the branch list, and now I can pull successfully.

blocks|key|215596|text|我遇到了同样的问题，我只是删除了远程分支，从主分支创建了新分支，并将我从旧功能分支到新功能分支的更改合并到了新功能分支。现在，我尝试了拉和推请求，这对我很有效|type|unstyled|depth|inlineStyleRanges|entityRanges|data|215597|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I faced same issue , I just deleted the remote branch and created new branch from the master and merged my changes from old feature branch to new feature branch . Now i tried pull and push requests its worked for me

blocks|key|215614|text|我已经尝试了多个选项，但没有一个选项对我有效。下面的命令对我有效。把它放在这里，如果它能帮助人们以防其他选择不起作用的话。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|215615|git拉取-p|offset|length|style|BOLD|215616|entityMap^0|0|0|7|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@$D|L|E|M|F|G]]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

I have tried multiple options but no option worked for me. Below command worked for me. Putting it here, if it can help people incase other options does not work.
git pull -p

blocks|key|2866172|text|我曾经遇到过这个问题，我的解决方案如下：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2866173|步骤1：|2866174|2866175|请先运行此命令。|ordered-list-item|2866176|2866177|git+gc+--Prune=now|offset|length|style|BOLD|2866178|第2步：|2866179|2866180|如果在运行步骤1命令后没有出现错误，则在您的终端中运行以下命令。|2866181|2866182|git+remote+Prune+Origin|2866183|我希望这能解决你的问题。|2866184|entityMap^0|0|0|0|0|0|0|I|0|0|0|0|0|0|N|0|0^^$0|@$1|2|3|4|5|6|7|10|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|11|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|12|8|@]|9|@]|A|$]]|$1|E|3|F|5|G|7|13|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|14|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|15|8|@$K|16|L|17|M|N]]|9|@]|A|$]]|$1|O|3|P|5|6|7|18|8|@]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|19|8|@]|9|@]|A|$]]|$1|R|3|S|5|G|7|1A|8|@]|9|@]|A|$]]|$1|T|3|-4|5|6|7|1B|8|@]|9|@]|A|$]]|$1|U|3|V|5|6|7|1C|8|@$K|1D|L|1E|M|N]]|9|@]|A|$]]|$1|W|3|X|5|6|7|1F|8|@]|9|@]|A|$]]|$1|Y|3|-4|5|6|7|1G|8|@]|9|@]|A|$]]]|Z|$]]

I have faced this issue and my solution is given below:
Step 1:
<ol>
<li>Please run this command first.
git gc --Prune=now
</li>
</ol>
Step 2:
<ol>
<li>If there is no error after running Step 1 command then run this below command in your terminal.
git remote Prune Origin
</li>
</ol>
I hope this will fix your problem.

blocks|key|3079554|text|经过不断的搜索，这就是对我有效的解决方案，它需要取消设置/删除上游|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3079555|git+branch+--unset-upstream|code-block|syntax|javascript|3079556|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

After searching constantly, this is the solution that worked for me which entails unsetting/removing the Upstream

<pre><code>git branch --unset-upstream
</code></pre>

Full message:

<pre><code>error: Ref refs/remotes/origin/user is at 3636498c2ea7735fdcedc9af5ab3c8689e6abe77 but expected a21359c6cc2097c85775cde6a40105f4bd7100ec
From github.com:{github project url}
 ! a21359c..6273ffc user -&gt; origin/user (unable to update local ref)
</code></pre>

git pull error :error: remote ref is at but expected

文件系统

Bitbucket

Windows

Unix

完整消息：error: Ref refs/remotes/origin/user is at 3636498c2ea7735fdcedc9af5ab3c8689e6abe77 but expected a21359c6cc2097c85775cde6a40105f4bd7100ecFrom github.com:{github project url} ! a21359c..6273ffc  us

问git pull错误:错误:远程引用位于，但应为
EN

回答 18

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git pull错误:错误:远程引用位于，但应为EN

回答 18

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git pull错误:错误:远程引用位于，但应为
EN