phpstrom - git push failed

Question

git push to remote repository failed

I will pull the remote warehouse to the local warehouse first

Now local——dev-v1 and origin——dev-v1 are in sync

Then anyone can change something and submit it

Submit the local one now and pull it down symbolically to see if there is any conflict

There is no conflict, then push

What a tragedy...

Answer 1

Look at the prompts. The server-side changes are not merged locally. Look at the prompts again and just merge them. If you want to find out the reason, finally install a git client program, enter git bash, and look at git status to understand.

Answer 2

Brother on the first floor gave a good answer. You can try to see if the local and remote versions are inconsistent. After merging, it should be finepush. Give it a try

Answer 3

Brother, I have a suggestion. You can use the command, which is convenient and fast, or there is a tool called sourcetree, which is also very useful