无法拉取最新源

Question

当我尝试从团队资源管理器中的 git 中拉出时，我收到一条非常无用的消息：

我在本地没有什么可提交的了：

我可以使用一些关于从哪里开始寻找这个的提示，例如如何甚至找出这两个冲突是什么（错误不可点击钻取或任何东西）。

我有一些未跟踪的更改，但它们只是包文件，例如 Entity Framework 6.1

编辑：git状态：

On branch dev Your branch and 'origin/dev' have diverged, and have 2 and 16 different commits each, respectively. (use "git pull" to merge the remote branch into yours)

当尝试 git 拉取时，它引用了在 vis studio team explorer 中任何地方都没有显示的文件以提交：

error: Your local changes to the following files would be overwritten by merge:
    packages/Modernizr.2.6.2/Content/Scripts/modernizr-2.6.2.js
    packages/Respond.1.2.0/content/Scripts/respond.js
    packages/Respond.1.2.0/content/Scripts/respond.min.js
    packages/bootstrap.3.0.0/content/Content/bootstrap.css
    packages/bootstrap.3.0.0/content/Content/bootstrap.min.css
    packages/bootstrap.3.0.0/content/Scripts/bootstrap.js
    packages/bootstrap.3.0.0/content/Scripts/bootstrap.min.js
    packages/jQuery.1.10.2/Content/Scripts/jquery-1.10.2.js
    packages/jQuery.1.10.2/Content/Scripts/jquery-1.10.2.min.js
    packages/jQuery.Validation.1.11.1/Content/Scripts/jquery.validate.js
    packages/jQuery.Validation.1.11.1/Content/Scripts/jquery.validate.min.js

Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
    Web/Web.config
    packages/elmah.corelibrary.1.2.2/elmah.corelibrary.1.2.2.nupkg
    packages/elmah.corelibrary.1.2.2/lib/Elmah.dll

请先移动或删除它们，然后才能合并。中止

Answer 1

通过运行 git stash 隐藏，然后执行 git pull

无法拉取最新源

Can't pull latest source

github