andorid-git pull 提示错误,Your local changes to the following files would be overwritten by merge
错误信息error:Yourlocalchangestothefollowingfileswouldbeoverwrittenbymerge:Pleasecommityourchangesorstashthembeforeyoumerge.解决办法:$gitstash//暂存当前正在进行的工作。$gitpulloriginmaster//拉取服务器的代码$gitstashpop//合并暂存的代码拓