blocks|key|141297|text|当它这样说的时候，只需打开外壳并执行git+status。这会让你对可能的错误和你的repo的状态有一个很好的了解。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|141298|我不能给你一个具体的错误，因为它发生在Github+for+Windows中有很多原因，比如更新子模块等问题。|141299|entityMap^0|I|A|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|M|8|@]|D|@]|E|$]]|$1|H|3|-4|5|6|7|N|8|@]|D|@]|E|$]]]|I|$]]

When it says that, just open the shell and do <code>git status</code>. That will give you a decent idea of what could be wrong and the state of your repo.

I can't give you a specific error for this as it happens for many reasons in Github for Windows, like say some problem in updating submodules etc.

blocks|key|141397|text|此错误是由于文件中的合并冲突造成的。在我更新了我的Maven项目的pom.xml但没有提交之后，我面对了这个问题。使用|type|unstyled|depth|inlineStyleRanges|entityRanges|data|141398|git+status
error:+Your+local+changes+to+the+following+files+would+be+overwritten+by+merge:
<my+project>/pom.xml
Please,+commit+your+changes+or+stash+them+before+you+can+merge.
Aborting|code-block|syntax|javascript|141399|正如上面的帖子所建议的那样，可以帮助找到任何冲突的更改，您可以决定放弃或提交。|141400|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|$]]

This error comes because of a merge conflict in files. I faced it after I had updated my Maven Project's pom.xml but didn't commit it. Using 

<pre><code>git status
error: Your local changes to the following files would be overwritten by merge:
&lt;my project&gt;/pom.xml
Please, commit your changes or stash them before you can merge.
Aborting
</code></pre>

as the above post suggested helped finding any conflicting changes and you can decide to discard or commit.

blocks|key|141513|text|我也有同样的问题。这发生在我身上是因为一些相互冲突的变化。我从我的桌面上删除了我的项目的本地存储库，然后从github网站再次克隆了它(使用我帐户中的克隆选项)，错误就消失了。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|141514|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 had the same problem. It happened to me because of some conflicting changes. I removed the local repository of my project from my desktop and then cloned it again from the github website (using clone option in my account), the error was gone.

blocks|key|141644|text|当我在Visual+Studio内部尝试时，我也遇到了同样的问题，shell中的"git+status“显示没有问题。但我设法通过shell使用"git+push“来推送本地更改。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|141645|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 had the same problem when I tried from inside Visual Studio and "git status" in shell showed no problem. But I managed to push the local changes with "git push" via shell.

blocks|key|359333|text|我遇到了这个问题，并发现这与代理有关。我使用以下命令修复了这个问题：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|359334|+git+config+--global+http.proxy+%25HTTP_PROXY%25|code-block|syntax|javascript|359335|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 had this problem and found it was to do with the proxy. I fixed the problem using this command: 

<pre><code> git config --global http.proxy %HTTP_PROXY%
</code></pre>

blocks|key|141351|text|这可能是一个边缘情况，但每次我收到这个特定的错误，都是因为我最近在Windows中映射了一个驱动器，而powershell找不到它。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|141352|重启计算机就能帮我修复这个错误，因为powershell现在可以获取新映射的驱动器了。只需确保在打开github客户端之前连接到映射的驱动器即可。|141353|entityMap^0|1F|A|0|I|A|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|M|8|@$9|N|A|O|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|P|8|@]|D|@]|E|$]]]|I|$]]

This is probably an edge case, but every time I've got this specific error it is because I've recently mapped a drive in Windows, and <code>powershell</code> cannot find it.

A computer restart (of all things) fixes the error for me, as <code>powershell</code> can now pick up the newly mapped drive. Just make sure you connect to the mapped drive BEFORE opening the github client.

blocks|key|141473|text|我也有同样的问题。在我的例子中，git找不到全局变量%25HTTP_PROXY%25，原因很简单，因为Windows没有提供/使用它。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|141474|我通过从git配置文件(位于%25USERPROFILE%25\.gitconfig中)中排除该变量来解决这个问题：|141475|[http]
#+++proxy+=+%25HTTP_PROXY%25|code-block|syntax|javascript|141476|entityMap^0|Q|C|0|E|O|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|R|8|@$9|S|A|T|B|C]]|D|@]|E|$]]|$1|H|3|I|5|J|7|U|8|@]|D|@]|E|$K|L]]|$1|M|3|-4|5|6|7|V|8|@]|D|@]|E|$]]]|N|$]]

I had the same problem. In my case git could not find the global variable <code>%HTTP_PROXY%</code>, simply because Windows was not providing/using it.

I solved it by excluding the variable from the git config file (located in <code>%USERPROFILE%\.gitconfig</code>):

<pre><code>[http]
# proxy = %HTTP_PROXY%
</code></pre>

blocks|key|141592|text|您最近是否更改过Windows密码，或者至少更改过用于连接到代理服务器的密码？|type|unstyled|depth|inlineStyleRanges|entityRanges|data|141593|这是我的问题，git+status帮不了我。我必须在".git/config“文件中更改我的登录凭据才能克服这个错误。|offset|length|style|CODE|141594|entityMap^0|0|7|A|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|$]]

Have you changed your Windows password recently, or at least the one you use to connect to your proxy?

This was my problem, and <code>git status</code> couldn't help me. I had to change my login credentials in the ".git/config" file to get past this error.

blocks|key|141546|text|如果您尝试同步的分支已被删除，也会发生此错误。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|141547|git+status不会告诉你这一点，但是如果你尝试git+pull，你会得到一条“没有这样的引用被获取”的消息。|offset|length|style|CODE|141548|entityMap^0|0|0|A|Q|8|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|$]]

This error also occurs if the branch you're trying to sync has been deleted. 

<code>git status</code> won't tell you that, but you'll get a "no such ref was fetched" message if you try <code>git pull</code>.

blocks|key|141692|text|另一个可能导致此问题的原因是，在GitHub桌面已启动后映射网络驱动器或连接虚拟硬盘。原因是GitHub桌面使用便携式GIT安装中的ssh-agent来建立连接，并且从不关闭它……即使您卸载了应用程序。该进程在不知道新驱动器的情况下启动，并且永远不会刷新自己，并且当使用它来运行GIT命令来处理您的存储库时，它会失败，因为它不了解路径。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|141693|这种情况下的解决方案是关闭ssh桌面并使用任务管理器终止正在运行的GitHub代理，然后再重新启动它。这将在需要时启动一个新的ssh-agent实例，该实例将获取新的驱动器映射，等等。|141694|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

One more thing that can cause this is when you map a network drive or connect a VHD after GitHub Desktop has already been started. The reason for this is that GitHub Desktop uses ssh-agent from the portable GIT install to establish connections, and never closes it... even if you uninstall the application. The process starts with no knowledge of the new drive and never refreshes itself, and when it is used to run the GIT commands to work on your repo it fails because it doesn't understand the paths.

The solution in this instance is to close GitHub Desktop and use Task Manager to terminate the running ssh-agent before starting it again. This will start a new instance of ssh-agent when needed which will pick up the new drive mappings, etc.

blocks|key|359593|text|确保您尝试推送到的分支未受到保护。我试图推送到一个受保护的分支，但和你一样失败了。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|359594|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|$]]

Make sure that the branch you are trying to push to isn't protected. I was trying to push to a protected branch and failed same as you.

blocks|key|359463|text|按照HTTP代理应答的思路，这也可能是由于VPN连接造成的。断开VPN连接为我解决了这个问题。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|359464|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|$]]

Along the lines of the HTTP Proxy answers, this can also happen due to a VPN connection. Disconnecting my VPN connection solved it for me.

blocks|key|359615|text|我也有同样的问题。我从GitHub+Windows客户端(右键菜单)中删除了存储库，并重新添加了它。当我重新添加时，我注意到我有大约300个未提交的更改，并且它报告了一个内存错误。我放弃了所有的更改，然后sync又开始正常工作。(菜鸟Git用户-我相信在命令行上有更好的方法可以做到这一点)|type|unstyled|depth|inlineStyleRanges|entityRanges|data|359616|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 had the same issue. I removed the repo from the GitHub Windows client (right-click menu) and re-added it. When I re-added, I noticed I had about 300 uncommitted changes and it was reporting a memory error. I discarded all the changes and then sync started working fine again. (Rookie Git user - I'm sure there are better ways to do this on the command line)

blocks|key|359646|text|调试日志可以提供一些洞察力。我使用的是v3.3.4.0，您的体验可能有所不同，但应该是相似的。从设置菜单中选择“关于Github桌面...”。单击该链接可查看调试日志。在我的例子中，有一个非常明显的错误：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|359647|*致命错误-检测到cygheap基础不匹配-+0x1157408/0x1167408。此问题可能是由于使用cygwin+DLL的不兼容版本造成的。|359648|它甚至提供了一些有用的提示来解决这个问题。|359649|我不确定为什么错误提示中没有显示此信息，但至少它是可用的。|359650|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|L|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|M|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

The debug log may provide some insight. I'm using v3.3.4.0, your experience may differ but should be similar. From the settings menu choose 'About Github Desktop...'. Click the link to view the debug log. In my case there was a very clear error:

*** fatal error - cygheap base mismatch detected - 0x1157408/0x1167408.
This problem is probably due to using incompatible versions of the cygwin DLL.

It even provided some helpful tips to solve the problem.

I'm not sure why this information isn't exposed in the error prompt, but at least it was available.

I am using Github Windows 1.0.38.1 and when I click the 'Sync' button after committing, I get the error 

<img src="https://i.stack.imgur.com/U3x8D.png" alt="enter image description here">

How do I debug this problem? If in the shell, what should I do?

The sync works fine if i do a <code>git push</code> or <code>git pull</code>, but the next time I want to sync using Github windows, I get the same error.

Github Windows 'Failed to sync this branch'

Visual Studio

服务器

Windows

GitHub

我使用的是Github Windows 1.0.38.1，当我在提交后点击‘同步’按钮时，我得到了错误​​如何调试此问题？如果在shell中，我应该怎么做？如果我使用git push或git pull，同步效果会很好，但下次我想使用Github窗口进行同步时，我会得到同样的错误。

问Github Windows‘无法同步此分支’
EN

回答 14

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Github Windows‘无法同步此分支’EN

回答 14

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Github Windows‘无法同步此分支’
EN