无法使用gitextensions提交更改 [英] Cannot commit changes with gitextensions

问题描述

我试图将我的更改提交给我们的主人，这对我来说现在使用VS13和Git比VS和TFS更困难...

我更改了一个.cs文件，并希望提交更改以进行同步。
当我点击pull时，它告诉我Repository已经是最新的了，没有改变拉。

但是当我点击提交时，我得到： 发生错误，详细信息：无法从未完全合并的索引创建树。

我尝试谷歌这个错误，但我真的找不到有用的东西。

有人知道我＃M做错了什么吗？
谢谢

编辑：我不知道这是否相关，但是上周五我没有保留（？）前一周左右存储的一些更改。这些更改仍然存在，我只是修复了一些小错误，并排除了此提交的所有其他更改。

在Visual Studio中，右键到提交按钮，按动作并选择打开命令提示符。 Git控制台窗口将显示出来。运行 git status 命令查看哪些文件将被提交。

根据你的情况，应该有一些东西在未合并路径部分。使用 git add [file_name] 命令将此未合并文件添加到您的更改中，而不是在Visual Studio中打开文件并对其进行修改，以留下正确版本的更改。

I'm trying to commit my changes to our master and this seems a little harder to me using VS13 and Git now, than VS and TFS...

I changed one .cs file and wanted to commit my changes to sync it afterwards. When I click "pull" it tells me "Repository is already up to date. No changes to pull."

But when I click commit i get: "An error occurred. Detailed message: Cannot create a tree from a not fully merged index."

I tryed to google this error, but I cannot really find anything helpful.

Does anybody know what I#M doing wrong? Thanks

EDIT: I dont know if this is relevant or not, but last friday I unstashed(?) some changes I stashed a week before or so. Those changes are still there, I just fixed some minor bug and excluded all other changes for this commit.

解决方案

In Visual Studio, right to Commit button, press Actions and choose Open Command Prompt. Git console window will show up. Run git status command to see which files are going to be committed.

According to your situation there should be something in Unmerged paths section. Add this unmerged files to your changes using git add [file_name] command, than open file in Visual Studio and modify it leaving correct version of changes.

这篇关于无法使用gitextensions提交更改的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！