Git使用

git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin

git -c diff.mnemonicprefix=false -c core.quotepath=false pull origin master
From https://git.trustedsign.com/frontend/ESS-frontend
* branch master -> FETCH_HEAD

Updating a1c4ad4..4240d4b
error: Your local changes to the following files would be overwritten by merge:
bower.json
Please, commit your changes or stash them before you can merge.
Aborting

完成时带有错误，见上文。

解决办法

我这个做法参考自：
http://blog.csdn.net/iefreer/article/details/7679631