Check out example codes for "VS2015 git An error occurred. Detailed message: 1 conflict prevents checkout". It will help you in understanding the concepts better.

Code Example 1

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

Learn ReactJs, React Native from akashmittal.com