无法在Visual Studio 2013中同步Git [英] Cannot Sync Git in Visual Studio 2013

查看:155
本文介绍了无法在Visual Studio 2013中同步Git的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!

问题描述

我正在与另一位开发人员合作,我们似乎已经把自己变成了GIT泡菜。
我定期提交代码并定期推送给远程主服务器。我的同事(虽然是一个伟大的人和开发者)并没有养成这样的习惯,当我今天早上去拉头修改时(正如我的习惯),我遇到了以下错误信息:


由于存在未提交的更改,因此无法提取。再次提交之前提交或撤消更改。详细信息请参阅输出窗口。


然后我注意到有5个传入的提交可以追溯到5天前。我完全没有本地提交,也没有阶段性变更。



我尝试了在Sync接口中同步,拉取和其他一切,无济于事。 / p>

是否有其他人经历过这种情况,他们能否帮助我解决它?

谢谢

解决方案

我有同样的问题,因为许多包文件在服务器上被删除而没有被使用。我必须打开命令提示符并运行以下命令来查看所有错误:

  git pull 



我看到这个错误以及要移除的文件列表:

 请在合并之前移动或移除它们。 
正在中止。

删除它们之后,我能够成功地进行拉取。

I'm working with another developer and we seem to have got ourselves into a GIT pickle. I commit code regularly and regularly push to the remote master. My colleague (whilst a great guy and developer) has not got into the habit of doing this and when I went to Pull the Head revision this morning (as is my habit), I was faced with the following error message:

Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details.

I then noticed there were 5 incoming commits dating back to 5 days earlier. I have no local commits at all and no staged changes.

I've tried Sync'ing, pulling and everything else I could in the VS interface to no avail.

Has anyone else experienced this and can they help me resolve it please.

Thanks

解决方案

I had the same problem, because a number of package files were removed on the server which were not being used. I had to open command prompt and see all errors by running:

git pull

I saw this error with a list of files to remove:

Please move or remove them before you can merge.
Aborting. 

After removing them I was able to successfully do a pull.

这篇关于无法在Visual Studio 2013中同步Git的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!

查看全文
登录 关闭
扫码关注1秒登录
发送“验证码”获取 | 15天全站免登陆