首页 > 其他 > 详细

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

时间:2016-06-10 14:50:29      阅读:1765      评论:0      收藏:0      [点我收藏+]
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

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

原文:http://www.cnblogs.com/tanglimei/p/5573614.html

(0)
(0)
   
举报
评论 一句话评论(0
关于我们 - 联系我们 - 留言反馈 - 联系我们:wmxa8@hotmail.com
© 2014 bubuko.com 版权所有
打开技术之扣,分享程序人生!