[github]——Updates were rejected because the tip of your current branch is behind错误

Problem Description:

I went through a rather bumpy reset process, and now I don't know where I am. After

execution git push origin master, the following error is reported:

problem solved

git statusThen you see the following:

so follow the above, proceed git pullto merge the branches, the result is as follows:

follow the prompts, delete the above files:
emmmm later manually deleted...

Execute again git pull, and the result is as follows:

Manually resolve the conflict ~ After
the conflict is resolved, you need to re-add, commit, push according to reference [1], first execute git add -u, and use to git log -n 1 --statview:

then perform git commit and git push origin master.
However, my tm never There is no one-time successful push~, the following error is reported:

None of this works, it is purely that my server is ill.

reference:

[1]: AutoMatic merge failed；fix conflicts and then commit the result