git-bug-“refusing to merge unrelated histories”

来源:互联网 发布:淘宝网c2c商业模式 编辑:程序博客网 时间:2024/06/05 10:40

git checkout mastergit merge origin/master --allow-unrelated-histories

Resolve conflict, then

git add -A .git commit -m "Upload"git push
阅读全文
0 0