GIT - error: Your local changes to the following files would be overwritten by m

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

猜你喜欢

转载自lg70124752.iteye.com/blog/2000245