git pull 代碼合併問題

本地修改某個文件後,想把遠程倉庫代碼git pull下來再提交,恰巧同事已經修改那文件並提交到倉庫裏,這時候出現 error: Your local changes to the following files would be overwritten by merge: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Please, commit your

>>阅读原文<<