解决Git error: Your local changes to the following files would be overwritten by merge
当本地修改的代码与远程仓库的代码有冲突时pull代码会发生如下错误:
error: Your local changes to the following files would be overwritten by merge:
README.md
Please commit your changes or stash them before you merge.
Aborting