标签：
git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree fetch origin git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree pull --no-commit origin dev From https://git.oschina.net/***** * branch dev -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: **/**/App/LaunchViewController.m Please, commit your changes or stash them before you can merge. Aborting Completed with errors, see above
先将自己本地的代码commit之后，再update
标签：
原文地址：http://www.cnblogs.com/tanglimei/p/5573614.html
