1、git pull origin master --allow-unrelated-histories //把远程仓库和本地同步，消除差异
2、重新add和commit相应文件
3、git push origin master
4、此时就能够上传成功了
- THE END -
最后修改：2020年8月3日
! [rejected] master -> master (non-fast-forward) error: failed to push some refs to ‘https://github.com/hl1064974123/cms-iframe.git’ hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: ‘git pull …’) before pushing again. hint: See the ‘Note about fast-forwards’ in ‘git push –help’ for details.
helei 2020-8-3
581
8/3
![! [rejected] master -> master (non-fast-forward) error: failed to push some refs to ‘https://github.com/hl1064974123/cms-iframe.git’ hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: ‘git pull …’) before pushing again. hint: See the ‘Note about fast-forwards’ in ‘git push –help’ for details.](https://www.95app.top/wp-content/themes/qzdy/timthumb.php?src=https://www.95app.top/wp-content/themes/qzdy/images/random/5.jpg&w=300&h=240&zc=1&q=100)
