Git pull error: Your local changes to the following files would be overwritten by merge:

联合开发，遇上的一个问题，果然，在此验证了百度的不靠谱，是谷歌出的答案......

stackoverflow上有解决方案，链接：http://stackoverflow.com/questions/25597104/git-pull-error-your-local-changes-to-the-following-files-would-be-overwritten-b

 

解决策略：