When you see :
error: Your local changes to the following files would be overwritten by merge:
Execute the following :
#1 -
git reset --hard HEAD^
#2 -
git pull .git/ yourbranch
error: Your local changes to the following files would be overwritten by merge:
Execute the following :
#1 -
git reset --hard HEAD^
#2 -
git pull .git/ yourbranch