它山之石可以攻玉

摘要：用git pull来更新代码的时候，遇到了下面的问题： 1 error: Your local changes to the following files would be overwritten by merge: 2 xxx/xxx/xxx.php 3 Please, commit your 阅读全文