! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'gitee.com...'

1、git pull origin master --allow-unrelated-histories //把远程仓库和本地同步，消除差异

2、重新add和commit相应文件

3、git push origin master

4、此时就能够上传成功了