git pull 代码合并问题

本地修改某个文件后,想把远程仓库代码git pull下来再提交,恰巧同事已经修改那文件并提交到仓库里,这时候出现 error: Your local changes to the following files would be overwritten by merge: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Please, commit your

>>阅读原文<<