项目发送到码云上会提示冲突。

Question

真的可以看一下吗。折磨我一天了。项目发送到码云上。一直冲突，但是不清楚怎么改了。是我idea的步骤有问题吗，可以直接在idea设置吗？我有多个服务的话就只能提交一个上去。大谢
error: failed to push some refs to 'https://gitee.com/dxycc/gulimall.git'
To https://gitee.com/dxycc/gulimall.git
hint: Updates were rejected because the remote contains work that you do
! refs/heads/master:refs/heads/master [rejected] (fetch first)
hint: not have locally. This is usually caused by another repository pushing
Done
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.

Answer 1

the remote contains work that you do
! refs/heads/master:refs/heads/master [rejected] (fetch first)
hint: not have locally

应该是别人上传了新的文件，但你本地没有

You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again

试下先用git pull 拉去远程代码看下