sourcr tree 拉取提交时发生报错,该怎么解决
git吧
全部回复
仅看楼主
level 1
玄乐00 楼主
git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=manager-st fetch origin
git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=manager-st pull origin master
From https://git.oschina.net/louisliu/docbook_testing
* branch master -> FETCH_HEAD
Updating c4443c6..0a31f7a
error: Your local changes to the following files would be overwritten by merge:
Release/06-微网站/04设计管理/微网站.csv
Please commit your changes or stash them before you merge.
Aborting
2017年07月04日 06点07分 1
1