git pull拉取与本地冲突报错Your local changes to the following files would be overwritten by merge
几个小伙伴共同开发一个项目时，当其他小伙伴将其本地代码push提交入库，而我们本地在pull拉取之前也修改了文件，修改后再执行pull拉取，则会报错：
error: Your local changes to the following files would be overwritten by merge: member/index.php