1 uncommitted change would be overwritten by merge in visual studio 2013

Question

while i am trying to pull a source to git it shows error as follows"An error occurred. Detailed message: 1 uncommitted change would be overwritten by merge"

I searched and tried those things like: commit in local repository and pull remove the untracked files

Both not worked for me.

Answer 1

I did the following and it cleared things up nicely:

git status
git pull

Answer 2

do a stash before pull your changes ,no need to create a new commit to pull new changes

git stash;
git pull origin master;
git stash pop;

Nicely explained in

[Official documentaion] git stash