我的IDEA版本:2020.2.2:仅作为自己记录
需要在如下图中IDEA里输入:git pull origin master --allow-unrelated-histories

不然会报如下错误:
error: failed to push some refs to 'https://gitee.com/xxxxx/xxxxx.git'
hint: Updates were rejected because the remote contains work that you do
To https://gitee.com/xxxxx/xxxxx.git
! refs/heads/master:refs/heads/master [rejected] (fetch first)
Done
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.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.