git错误解决:Your local changes to the following files would be overwritten by merge
系统某些服务器配置文件修改,提交的时候会发生如下错误:error:Yourlocalchangestothefollowingfileswouldbeoverwrittenbymerge:protected/config/main.phpPlease,commityourchangesorstashthembeforeyoucanmerge.解决方法:希望保留产服务器所做改,仅仅并入新配置项,处理