Visual Studio 2015 Git error message “Cannot pull/switch because there are uncommitted changes”

by

For me I didn’t have any uncommitted changes or any untracked files, and Visual Studio 2015 still presented the warning.

  1. Close the solution in Visual Studio, exit Visual Studio.
  2. Open Git Bash (or your favorite Git UI)
  3. Navigate to your repository (or open the repository with the Git UI)
  4. git pull (or perform pull on the Git UI)
  5. Merge happens (hopefully no conflicts, as in my case), vi opens (or the default merge resolution tool)
  6. :wq then press ENTER in vi (or calm handle the merge tool which popped up optionally) and hopefully this resolves it just like for me.
  7. Start Visual Studio 2015, open the project

I added a safer step-by-step by instructing closing and opening the solution and Visual Studio. This may be over cautious, and maybe a reload would be enough. This symptom could be a bug of the Visual Studio Git integration parts, and maybe it’ll be resolved in the future.

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)