git push报错 rejected

error: failed to push some refs to ‘https://gitee.com/majun_real/community.git’
hint: Updates were rejected because the remote contains work that you do
To https://gitee.com/majun_real/community.git
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
! refs/heads/master:refs/heads/master [rejected] (fetch first)

! [rejected] master -> master (fetch first)
error: failed to push some refs to ‘https://gitee.com/xxxx.git’
hint: Updates were rejected because the remote contains work that you do
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.

原因：本地的仓库和远程仓库都被更新过，理论上push前应该先由远程pull下来，修改后然后push

造成这个错误是因为我在gitee上修改了自己的文件，在上传本地文件之前没有把gitee上的文件拉到本地，

意思是本地和远程的文件应该合并后才能上传本地的新文件

具体方法：

1、先拉下来，会自动合并的（不用操心）

git pull origin master

2、再上传

git push -u origin master