An error occurred. Detailed message: 1 conflict prevents checkout code example

Example: VS2015 git An error occurred. Detailed message: 1 conflict prevents checkout

git pull // I got an error on this step
git stash
git pull