git updates to remote after merging branches and reports error

Question

I want to update the code modified by my personal branch to the public development branch. After merging my branch into the local development branch, I want to update it to the remote through push, but an error occurs, and I often encounter it recently. The following is my error message {code...} I am a newbie, please give me some advice.

滿天的星座 · Answer

I think if your local development branchdevelop可能不是最新的，就是和远程的开发分支develop不是同一版本。这种问题我遇到过，一般你在执行git push origin 分支之前最好执行一下git pull origin 分支 is updated to the same version locally and remotely, then there will be no problem. You can try it again after executing the following command

#先执行
git pull origin develop
#在执行
git push origin develop

Hope it helps you

#先执行
git pull origin develop
#在执行
git push origin develop

Hope it helps you

伊谢尔伦 · Answer

Direct translation of this English sentence, it means that in addition to your commit, there are things in the remote version that you don’t have locally. Please git pullcheck it first

仅有的幸福 · Answer

He reminds you that the branch you want to push to has commits that you don’t have locally. It is recommended to git pull the merge first and then push.

我想大声告诉你 · Answer

When pushing, it is very likely that someone else has submitted new code to the remote branch, so you need to pull the code first to make the local code up to date. If there is a conflict, resolve it and then push the code