Git-上传冲突解决方法

报错内容:

failed to push some refs to '[email protected]:Sunpro108/Sunpro_Blog.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.

解决方法:

报错信息中也给出了建议,就是要合并另外一个远端修改,执行如下命令:

git pull origin master --allow-unrelated-histories

完美解决!

参考:
wenwen360360的博客-This is …

猜你喜欢

转载自blog.csdn.net/sunjinshengli/article/details/81115975
今日推荐