git push报错! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://gitee.com/XXX.git

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

git add .

git commit -m"XXX"

git push origin master