Your local changes to the following files would be overwritten by merge
error: Your local changes to the following files would be overwritten by merge:
输入以下命令,加上--hard 我以为是注释,害得绕了好多圈
git reset --hard
git pull
更多详情内容移步:http://blog.chinaunix.net/uid-10415985-id-4142896.html