Cannot commit changes with gitextensions

Question

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.

Answer 1

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.