Git冲突：commit your changes or stash them before you can merge. 解决办法
admin 9年前 (2014-12-10) 11878浏览 0评论
用git pull来更新代码的时候，遇到了下面的问题： error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.php P...
标签：git pull
admin 9年前 (2014-12-10) 11878浏览 0评论
用git pull来更新代码的时候，遇到了下面的问题： error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.php P...