error: Your local changes to the following files would be overwritten by merge:
http://blog.csdn.net/zwhfyy/article/details/8625228Yourlocalchangestothefollowingfileswouldbeoverwrittenbymergeerror:Yourlocalchangestothefollowingfileswouldbeoverwrittenbymerge: app/app.imlPlease,