赞
踩
1、 refusing to merge unrelated histories
git pull xxx master --allow-unrelated-histories
2、Pulling is not possible because you have unmerged files.
文件冲突,先解决冲突
git add .
git commit -m “解决冲突代码”
Copyright © 2003-2013 www.wpsshop.cn 版权所有,并保留所有权利。