git pull
From: ......
error: your local changes to the following files would overwritten by merge: 你修改文件的路径
Please commit your changes or stash them before you merge
Aborting ...
解决办法 : 点我
git pull
From: ......
error: your local changes to the following files would overwritten by merge: 你修改文件的路径
Please commit your changes or stash them before you merge
Aborting ...
解决办法 : 点我