kaveer
9/19/2016 - 5:17 AM

resolve conflict using command prompt

resolve conflict using command prompt

git stash list
git stash
git pull -v
git pull -v -force
git --version