Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.

和同事一塊兒使用git 。今天pull時候出現這個提示。git Your local changes would be overwritten by merge. svn Commit, stash or revert them to proceed.  spa 顯示。若是Pull 成功會把我修改的代碼覆蓋。3d 因此。按照提示。經過Android Studio 處理。blog 第一步。儲存我本身

>>阅读原文<<