使用git中出现的问题

今天从远程仓库pull时报错了，问题：Your local changes to the following files would be overwritten by merge:LeJiaSiDi.xcodeproj/project.pbxproj     please,commit your changes or stash them before you can merge. 大概意思是说

>>阅读原文<<