push to origin/master was rejected错误解决方案

1.切换到自己项目所在的目录，右键选择GIT BASH Here，Idea中可使用Alt+F12

2.在terminl窗口中依次输入命令：

git pull

git pull origin master

git pull origin master --allow-unrelated-histories